A reactive notebook for Python — run reproducible experiments, query with SQL, execute as a script, deploy as an app, and version with git. Stored as pure Python. All in a modern, AI-native editor.
Python artificial-intelligencedagdata-sciencedata-visualizationdataflowdeveloper-toolsmachine-learningnotebookspipelinepythonreactivesqlweb-app
add markdown rendering for tables in popout (#7299)
Shahmir Varqha94418f0d8013
diff --git a/frontend/src/components/chat/acp/blocks.tsx b/frontend/src/components/chat/acp/blocks.tsxindex dc25573f79..3db9277cd0 100644--- a/frontend/src/components/chat/acp/blocks.tsx+++ b/frontend/src/components/chat/acp/blocks.tsx@@ -26,6 +26,7 @@ import { JsonRpcError, mergeToolCalls } from "use-acp";import { z } from "zod";import { ReadonlyDiff } from "@/components/editor/code/readonly-diff";import { JsonOutput } from "@/components/editor/output/JsonOutput";+import { MarkdownRenderer } from "@/components/markdown/markdown-renderer";import { Button } from "@/components/ui/button";import {Popover,@@ -36,7 +37,6 @@ import { uniqueByTakeLast } from "@/utils/arrays";import { logNever } from "@/utils/assertNever";import { cn } from "@/utils/cn";import { Strings } from "@/utils/strings";-import { MarkdownRenderer } from "../markdown-renderer";import { SimpleAccordion } from "./common";import type {AgentNotificationEvent,diff --git a/frontend/src/components/chat/chat-panel.tsx b/frontend/src/components/chat/chat-panel.tsxindex 2b2d020f54..d2ca275b0d 100644--- a/frontend/src/components/chat/chat-panel.tsx+++ b/frontend/src/components/chat/chat-panel.tsx@@ -18,6 +18,7 @@ import {} from "lucide-react";import { memo, useEffect, useRef, useState } from "react";import useEvent from "react-use-event-hook";+import { MarkdownRenderer } from "@/components/markdown/markdown-renderer";import { Button } from "@/components/ui/button";import {Select,@@ -74,7 +75,6 @@ import {hasPendingToolCalls,isLastMessageReasoning,} from "./chat-utils";-import { MarkdownRenderer } from "./markdown-renderer";import { ReasoningAccordion } from "./reasoning-accordion";import { ToolCallAccordion } from "./tool-call-accordion";diff --git a/frontend/src/components/chat/reasoning-accordion.tsx b/frontend/src/components/chat/reasoning-accordion.tsxindex c349665d6c..b83ff8c895 100644--- a/frontend/src/components/chat/reasoning-accordion.tsx+++ b/frontend/src/components/chat/reasoning-accordion.tsx@@ -2,13 +2,13 @@import { BotMessageSquareIcon } from "lucide-react";import React from "react";+import { MarkdownRenderer } from "@/components/markdown/markdown-renderer";import {Accordion,AccordionContent,AccordionItem,AccordionTrigger,} from "@/components/ui/accordion";-import { MarkdownRenderer } from "./markdown-renderer";interface ReasoningAccordionProps {reasoning: string;diff --git a/frontend/src/components/data-table/__tests__/url-detector.test.tsx b/frontend/src/components/data-table/__tests__/url-detector.test.tsxindex b139810baf..3105bcebe5 100644--- a/frontend/src/components/data-table/__tests__/url-detector.test.tsx+++ b/frontend/src/components/data-table/__tests__/url-detector.test.tsx@@ -1,7 +1,7 @@/* Copyright 2024 Marimo. All rights reserved. */import { fireEvent, render, screen } from "@testing-library/react";import { describe, expect, it, vi } from "vitest";-import { parseContent, UrlDetector } from "../url-detector";+import { isMarkdown, parseContent, UrlDetector } from "../url-detector";describe("parseContent", () => {it("handles data URIs", () => {@@ -167,3 +167,94 @@ describe("UrlDetector", () => {expect(mockStopPropagation).toHaveBeenCalled();});});++describe("isMarkdown", () => {+ it("returns true for headings", () => {+ expect(isMarkdown("# Heading 1")).toBe(true);+ expect(isMarkdown("## Heading 2")).toBe(true);+ expect(isMarkdown("### Heading 3")).toBe(true);+ expect(isMarkdown("Heading\n===")).toBe(true);+ expect(isMarkdown("Heading\n---")).toBe(true);+ });++ it.fails("returns true for bold text", () => {+ expect(isMarkdown("**bold**")).toBe(true);+ expect(isMarkdown("__bold__")).toBe(true);+ });++ it.fails("returns true for italic text", () => {+ expect(isMarkdown("*italic*")).toBe(true);+ expect(isMarkdown("_italic_")).toBe(true);+ });++ it("returns false for inline code", () => {+ expect(isMarkdown("`code`")).toBe(false);+ expect(isMarkdown("Text with `inline code` in it")).toBe(false);+ });++ it("returns true for code blocks", () => {+ expect(isMarkdown("```\ncode block\n```")).toBe(true);+ expect(isMarkdown("```python\ndef hello():\n pass\n```")).toBe(true);+ });++ it("returns true for lists", () => {+ expect(isMarkdown("- item 1\n- item 2")).toBe(true);+ expect(isMarkdown("* item 1\n* item 2")).toBe(true);+ expect(isMarkdown("1. item 1\n2. item 2")).toBe(true);+ });++ it("returns true for blockquotes", () => {+ expect(isMarkdown("> This is a quote")).toBe(true);+ expect(isMarkdown("> Quote line 1\n> Quote line 2")).toBe(true);+ });++ it("returns true for horizontal rules", () => {+ expect(isMarkdown("---")).toBe(true);+ expect(isMarkdown("***")).toBe(true);+ expect(isMarkdown("___")).toBe(true);+ });++ it("returns true for tables", () => {+ expect(+ isMarkdown("| col1 | col2 |\n|------|------|\n| val1 | val2 |"),+ ).toBe(true);+ });++ it("returns true for HTML tags", () => {+ expect(isMarkdown("<div>content</div>")).toBe(true);+ expect(isMarkdown("<br />")).toBe(true);+ });++ it.fails("returns true for escaped characters", () => {+ expect(isMarkdown("\\*not bold\\*")).toBe(true);+ expect(isMarkdown("\\# not a heading")).toBe(true);+ });++ it("returns false for plain text", () => {+ expect(isMarkdown("Just plain text")).toBe(false);+ expect(isMarkdown("No markdown here")).toBe(false);+ });++ it("returns false for empty string", () => {+ expect(isMarkdown("")).toBe(false);+ });++ it("returns false for plain URLs without markdown syntax", () => {+ expect(isMarkdown("https://example.com")).toBe(false);+ expect(isMarkdown("Visit https://marimo.io for more")).toBe(false);+ });++ it("returns false for plain text with numbers", () => {+ expect(isMarkdown("123 456 789")).toBe(false);+ });++ it.fails("returns true for mixed markdown and plain text", () => {+ expect(isMarkdown("Plain text with **bold** in it")).toBe(true);+ expect(isMarkdown("Start with text\n\n# Then a heading")).toBe(true);+ });++ it.fails("returns true for markdown with URLs", () => {+ expect(isMarkdown("[Link](https://example.com)")).toBe(true);+ expect(isMarkdown("Visit [marimo](https://marimo.io)")).toBe(true);+ });+});diff --git a/frontend/src/components/data-table/columns.tsx b/frontend/src/components/data-table/columns.tsxindex 1064329658..7abea23d09 100644--- a/frontend/src/components/data-table/columns.tsx+++ b/frontend/src/components/data-table/columns.tsx@@ -15,6 +15,7 @@ import { Maps } from "@/utils/maps";import { Objects } from "@/utils/objects";import { EmotionCacheProvider } from "../editor/output/EmotionCacheProvider";import { JsonOutput } from "../editor/output/JsonOutput";+import { CopyClipboardIcon } from "../icons/copy-icon";import { Button } from "../ui/button";import { Checkbox } from "../ui/checkbox";import { Popover, PopoverContent, PopoverTrigger } from "../ui/popover";@@ -33,7 +34,7 @@ import {INDEX_COLUMN_NAME,} from "./types";import { uniformSample } from "./uniformSample";-import { parseContent, UrlDetector } from "./url-detector";+import { MarkdownUrlDetector, parseContent, UrlDetector } from "./url-detector";// Artificial limit to display long stringsconst MAX_STRING_LENGTH = 50;@@ -354,11 +355,18 @@ const PopoutColumn = ({align="start"alignOffset={10}>- <PopoverClose className="absolute top-2 right-2">- <Button variant="link" size="xs">- {buttonText ?? "Close"}- </Button>- </PopoverClose>+ <div className="absolute top-2 right-2">+ <CopyClipboardIcon+ value={rawStringValue}+ className="w-2.5 h-2.5"+ tooltip={false}+ />+ <PopoverClose>+ <Button variant="link" size="xs">+ {buttonText ?? "Close"}+ </Button>+ </PopoverClose>+ </div>{children}</PopoverContent></Popover>@@ -531,7 +539,7 @@ export function renderCellValue<TData, TValue>({buttonText="X"wrapped={isWrapped}>- <UrlDetector parts={parts} />+ <MarkdownUrlDetector content={stringValue} parts={parts} /></PopoutColumn>);}diff --git a/frontend/src/components/data-table/url-detector.tsx b/frontend/src/components/data-table/url-detector.tsxindex f7b9d32a78..2d6f84b632 100644--- a/frontend/src/components/data-table/url-detector.tsx+++ b/frontend/src/components/data-table/url-detector.tsx@@ -1,6 +1,8 @@/* Copyright 2024 Marimo. All rights reserved. */+import { marked } from "marked";import { useState } from "react";+import { MarkdownRenderer } from "@/components/markdown/markdown-renderer";import {Popover,PopoverContent,@@ -82,6 +84,47 @@ export function parseContent(text: string): ContentPart[] {});}+export function isMarkdown(text: string): boolean {+ const tokens = marked.lexer(text);++ const commonMarkdownIndicators = new Set([+ "space",+ "code",+ "fences",+ "heading",+ "hr",+ "link",+ "blockquote",+ "list",+ "html",+ "def",+ "table",+ "lheading",+ "escape",+ "tag",+ "reflink",+ "strong",+ "codespan",+ "url",+ ]);++ return tokens.some((token) => commonMarkdownIndicators.has(token.type));+}++// Wrapper component so that we call isMarkdown only on trigger+export const MarkdownUrlDetector = ({+ content,+ parts,+}: {+ content: string;+ parts: ContentPart[];+}) => {+ if (isMarkdown(content)) {+ return <MarkdownRenderer content={content} />;+ }+ return <UrlDetector parts={parts} />;+};+export const UrlDetector = ({ parts }: { parts: ContentPart[] }) => {const markup = parts.map((part, idx) => {if (part.type === "url") {diff --git a/frontend/src/components/chat/markdown-renderer.css b/frontend/src/components/markdown/markdown-renderer.csssimilarity index 100%rename from frontend/src/components/chat/markdown-renderer.cssrename to frontend/src/components/markdown/markdown-renderer.cssdiff --git a/frontend/src/components/chat/markdown-renderer.tsx b/frontend/src/components/markdown/markdown-renderer.tsxsimilarity index 100%rename from frontend/src/components/chat/markdown-renderer.tsxrename to frontend/src/components/markdown/markdown-renderer.tsxdiff --git a/frontend/vitest.config.ts b/frontend/vitest.config.tsindex ee1f8e5994..0c4f57c58b 100644--- a/frontend/vitest.config.ts+++ b/frontend/vitest.config.ts@@ -12,6 +12,13 @@ export default defineConfig({hooks: "parallel", // Maintain parallel hook execution from Vitest 1.x},watch: false,+ server: {+ deps: {+ // Inline streamdown so it gets processed by Vite's transform pipeline.+ // This allows CSS imports from streamdown's dependencies (e.g., katex CSS) to be processed.+ inline: [/streamdown/],+ },+ },},resolve: {tsconfigPaths: true,diff --git a/marimo/_smoke_tests/tables/markdown_example.py b/marimo/_smoke_tests/tables/markdown_example.pynew file mode 100644index 0000000000..d15357e709--- /dev/null+++ b/marimo/_smoke_tests/tables/markdown_example.py@@ -0,0 +1,52 @@+import marimo++__generated_with = "0.17.8"+app = marimo.App(width="medium")+++def _():+ import marimo as mo+ return (mo,)+++def _(markdown_sample, mo):+ mo.ui.table(+ {+ "heading": ["### Hello" * 8],+ "code_blocks": ["```python\n print('hi')\n```" * 3],+ "lists": ["- item 1\n* item 2\n1. item 3" * 3],+ "markdown_sample": [markdown_sample],+ }+ )+ return+++def _():+ markdown_sample = """+ # Markdown showcase++ ## Features:+ - **Lists:**+ - Bullet points+ - Numbered lists++ - **Emphasis:** *italic*, **bold**, ***bold italic***+ - **Links:** [Visit OpenAI](https://www.openai.com)+ - **Images:**++ ++ - **Blockquotes:**++ > Markdown makes writing simple and beautiful!++ Enjoy exploring markdown's versatility!+ """+ return (markdown_sample,)+++if __name__ == "__main__":+ app.run()