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
74 changes: 37 additions & 37 deletions src/components/grid/CellViewerModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -236,43 +236,43 @@ export function CellViewerModal({
)}

<div className="min-h-0 flex-1 p-4">
<div className="h-full overflow-hidden rounded border border-[var(--color-border)] bg-[var(--color-bg-primary)]">
{isNullValue
? (
<div className="p-3 text-xs font-mono italic text-[var(--color-text-muted)]">
NULL
</div>
)
: (
<Editor
height="100%"
language={language}
value={viewerContent}
onChange={(value) => {
if (isEditable) {
setDraftContent(value ?? "");
}
}}
onMount={onMount}
theme={theme === "dark" ? "vs-dark" : "vs"}
options={{
readOnly: !isEditable,
domReadOnly: !isEditable,
minimap: { enabled: false },
lineNumbers: "on",
scrollBeyondLastLine: false,
wordWrap: "on",
renderWhitespace: "selection",
folding: true,
fontSize: 12,
automaticLayout: true,
padding: { top: 8, bottom: 8 },
smoothScrolling: true,
renderLineHighlightOnlyWhenFocus: true,
}}
/>
)}
</div>
{isNullValue
? (
<div className="rounded border border-[var(--color-border)] bg-[var(--color-bg-primary)] p-3 text-xs font-mono italic text-[var(--color-text-muted)]">
NULL
</div>
)
: (
<Editor
key={`${columnName}-${viewerContent.length}`}
className="h-full w-full overflow-hidden rounded border border-[var(--color-border)] [&_.monaco-editor]:bg-[var(--color-bg-primary)]"
height="100%"
language={language}
value={viewerContent}
onChange={(value) => {
if (isEditable) {
setDraftContent(value ?? "");
}
}}
onMount={onMount}
theme={theme === "dark" ? "vs-dark" : "vs"}
options={{
readOnly: !isEditable,
domReadOnly: !isEditable,
minimap: { enabled: false },
lineNumbers: "on",
scrollBeyondLastLine: false,
wordWrap: "on",
renderWhitespace: "selection",
folding: true,
fontSize: 12,
automaticLayout: true,
padding: { top: 8, bottom: 8 },
smoothScrolling: true,
renderLineHighlightOnlyWhenFocus: true,
}}
/>
)}
</div>

<div className="flex justify-end gap-2 border-t border-[var(--color-border)] p-3">
Expand Down
41 changes: 40 additions & 1 deletion src/components/grid/__tests__/CellViewerModal.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@ import { CellViewerModal } from "../CellViewerModal";

vi.mock("@monaco-editor/react", () => ({
__esModule: true,
default: vi.fn(() => <div data-testid="monaco-editor">Monaco Editor</div>),
default: vi.fn(({ className }: { className?: string }) => (
<div data-testid="monaco-editor" className={className}>
Monaco Editor
</div>
)),
}));

vi.mock("sql-formatter", () => ({
Expand Down Expand Up @@ -137,6 +141,41 @@ describe("CellViewerModal", () => {
expect(screen.getByTestId("monaco-editor")).toBeInTheDocument();
});

it("applies full-size layout classes to Monaco editor wrapper (#217)", () => {
render(<CellViewerModal {...createDefaultProps({ content: "test" })} />);
const editor = screen.getByTestId("monaco-editor");
expect(editor.className).toMatch(/\bh-full\b/);
expect(editor.className).toMatch(/\bw-full\b/);
expect(editor.className).toMatch(/\boverflow-hidden\b/);
});

it("does not nest Monaco inside an extra overflow-hidden wrapper (#217)", () => {
const { container } = render(
<CellViewerModal {...createDefaultProps({ content: "test" })} />,
);
const editor = screen.getByTestId("monaco-editor");
const contentWrapper = container.querySelector(".min-h-0.flex-1.p-4");
expect(contentWrapper).not.toBeNull();
expect(contentWrapper?.firstElementChild).toBe(editor);
});

it("remounts Monaco editor when content length changes (#217)", async () => {
const { rerender } = render(
<CellViewerModal {...createDefaultProps({ content: "short" })} />,
);
const { default: MockedEditor } = await import("@monaco-editor/react");
const firstCalls = (MockedEditor as unknown as { mock: { calls: unknown[][] } })
.mock.calls.length;
rerender(
<CellViewerModal
{...createDefaultProps({ content: "a much longer content value" })}
/>,
);
const secondCalls = (MockedEditor as unknown as { mock: { calls: unknown[][] } })
.mock.calls.length;
expect(secondCalls).toBeGreaterThan(firstCalls);
});

it("shows search input when content length > 500", () => {
const longContent = "x".repeat(501);
render(<CellViewerModal {...createDefaultProps({ content: longContent })} />);
Expand Down
Loading