Skip to content

πŸ™Œ OpenHands: AI-Driven Development

refactor(diff): express the Markdown preview cap in CSS (#18762)

Engel Nyst20bb37e39d72
diff --git a/__tests__/components/features/diff-viewer/file-diff-viewer.test.tsx b/__tests__/components/features/diff-viewer/file-diff-viewer.test.tsx
index ef0e0617af..a6c2822598 100644
--- a/__tests__/components/features/diff-viewer/file-diff-viewer.test.tsx
+++ b/__tests__/components/features/diff-viewer/file-diff-viewer.test.tsx
@@ -1,3 +1,6 @@
+import { readFile } from "node:fs/promises";
+import { resolve } from "node:path";
+import { compile } from "@tailwindcss/node";
import { render, screen } from "@testing-library/react";
import userEvent from "@testing-library/user-event";
import { describe, it, expect, vi, beforeEach } from "vitest";
@@ -28,7 +31,11 @@ vi.mock("#/hooks/query/use-unified-git-diff", () => ({
vi.mock("@monaco-editor/react", () => ({
DiffEditor: (props: Record<string, unknown>) => (
- <div data-testid="file-diff-viewer" data-original={props.original} data-modified={props.modified} />
+ <div
+ data-testid="file-diff-viewer"
+ data-original={props.original}
+ data-modified={props.modified}
+ />
),
Editor: (props: Record<string, unknown>) => (
<div data-testid="file-single-viewer" data-value={props.value} />
@@ -98,7 +105,10 @@ describe("FileDiffViewer", () => {
await user.click(screen.getByTestId("view-mode-new"));
expect(screen.getByTestId("file-single-viewer")).toBeInTheDocument();
- expect(screen.getByTestId("file-single-viewer")).toHaveAttribute("data-value", "new content");
+ expect(screen.getByTestId("file-single-viewer")).toHaveAttribute(
+ "data-value",
+ "new content",
+ );
expect(screen.queryByTestId("file-diff-viewer")).not.toBeInTheDocument();
});
@@ -110,7 +120,10 @@ describe("FileDiffViewer", () => {
await user.click(screen.getByTestId("view-mode-old"));
expect(screen.getByTestId("file-single-viewer")).toBeInTheDocument();
- expect(screen.getByTestId("file-single-viewer")).toHaveAttribute("data-value", "old content");
+ expect(screen.getByTestId("file-single-viewer")).toHaveAttribute(
+ "data-value",
+ "old content",
+ );
});
it("returns to diff editor when switching back to 'diff' mode", async () => {
@@ -134,11 +147,42 @@ describe("FileDiffViewer", () => {
await user.click(screen.getByTestId("view-mode-new"));
expect(screen.getByTestId("markdown-preview")).toBeInTheDocument();
- expect(screen.getByTestId("markdown-renderer")).toHaveTextContent(/New Heading/);
+ expect(screen.getByTestId("markdown-renderer")).toHaveTextContent(
+ /New Heading/,
+ );
expect(screen.getByTestId("markdown-renderer")).toHaveTextContent(/bold/);
expect(screen.queryByTestId("file-single-viewer")).not.toBeInTheDocument();
});
+ it("compiles the rendered Markdown preview cap against its owned value", async () => {
+ // Arrange
+ mockDiff = MOCK_MD_DIFF;
+ const user = userEvent.setup();
+ render(<FileDiffViewer path="README.md" type="M" />);
+ const compiler = await compile(
+ await readFile(resolve("src/tailwind.css"), "utf8"),
+ { base: resolve("src"), onDependency: () => {} },
+ );
+
+ // Act
+ await expand(user);
+ await user.click(screen.getByTestId("view-mode-new"));
+ const preview = screen.getByTestId("markdown-preview");
+ const css = compiler.build(
+ [...preview.classList].filter((candidate) =>
+ candidate.startsWith("max-h-"),
+ ),
+ );
+
+ // Assert the generated declaration consumes a value this element owns.
+ // Reading both from the render catches either side being renamed alone.
+ const property = css.match(/max-height:\s*var\((--[\w-]+)\)/)?.[1];
+ expect(property).toBeDefined();
+ expect(preview.style.getPropertyValue(property!)).toBe(
+ `${MAX_DIFF_EDITOR_HEIGHT_PX}px`,
+ );
+ });
+
it("renders markdown preview for .md files in 'old' mode", async () => {
mockDiff = MOCK_MD_DIFF;
const user = userEvent.setup();
@@ -147,7 +191,9 @@ describe("FileDiffViewer", () => {
await expand(user);
await user.click(screen.getByTestId("view-mode-old"));
- expect(screen.getByTestId("markdown-renderer")).toHaveTextContent(MOCK_MD_DIFF.original);
+ expect(screen.getByTestId("markdown-renderer")).toHaveTextContent(
+ MOCK_MD_DIFF.original,
+ );
});
it("shows diff editor for .md files in 'diff' mode", async () => {
diff --git a/src/components/features/diff-viewer/file-diff-viewer.tsx b/src/components/features/diff-viewer/file-diff-viewer.tsx
index d7334fea43..4e17559e08 100644
--- a/src/components/features/diff-viewer/file-diff-viewer.tsx
+++ b/src/components/features/diff-viewer/file-diff-viewer.tsx
@@ -315,11 +315,15 @@ export function FileDiffViewer({
return (
<div
className={cn(
- "w-full border-b border-border overflow-auto p-4 bg-canvas-base prose max-w-none",
+ "w-full border-b border-border overflow-auto p-4 bg-canvas-base prose max-w-none max-h-(--markdown-preview-max-height)",
!isLightTheme && "prose-invert",
)}
data-testid="markdown-preview"
- style={{ maxHeight: MAX_DIFF_EDITOR_HEIGHT_PX }}
+ style={
+ {
+ "--markdown-preview-max-height": `${MAX_DIFF_EDITOR_HEIGHT_PX}px`,
+ } as React.CSSProperties
+ }
>
<MarkdownRenderer
content={singleViewContent}