Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.
Python agentagentic-aiagentic-frameworkagentic-workflowaiautomationclaudedeepseekgenaigptllmlow-codemcpnextjsno-codeopenaipythonskillsworkflow
refactor(web): simplify Mermaid preview layout and interactions (#44335)
yyh15ed349b1d2e
diff --git a/web/app/components/base/markdown-blocks/mermaid-diagram/__tests__/diagram.browser.spec.tsx b/web/app/components/base/markdown-blocks/mermaid-diagram/__tests__/diagram.browser.spec.tsxindex e551571adc1..6312f4369fa 100644--- a/web/app/components/base/markdown-blocks/mermaid-diagram/__tests__/diagram.browser.spec.tsx+++ b/web/app/components/base/markdown-blocks/mermaid-diagram/__tests__/diagram.browser.spec.tsx@@ -5,6 +5,7 @@ import {DrawerPortal,DrawerViewport,} from '@langgenius/dify-ui/drawer'+import { TooltipProvider } from '@langgenius/dify-ui/tooltip'import { page, userEvent } from 'vite-plus/test/browser'import { render } from 'vitest-browser-react'import { MermaidDiagram } from '..'@@ -37,7 +38,7 @@ it('reflows a narrow diagram without resize errors and preserves its theme in th() =>view.getByText('Generate answer').element().closest('svg')!.getBoundingClientRect().width,)- .toBeLessThanOrEqual(296)+ .toBeLessThanOrEqual(320)document.documentElement.dataset.theme = 'dark'await expect.poll(() => getComputedStyle(view.getByText('Generate answer').element()).fill)@@ -78,7 +79,7 @@ it('contains diagrams even when source configuration requests a fixed width', as)await expect.element(view.getByText('Browse catalog')).toBeVisible()const diagram = view.getByText('Browse catalog').element().closest('svg')!- expect(diagram.getBoundingClientRect().width).toBeLessThanOrEqual(296)+ expect(diagram.getBoundingClientRect().width).toBeLessThanOrEqual(320)const controls = view.getByRole('button', { name: 'app.mermaid.preview' }).element()expect(controls.getBoundingClientRect().bottom).toBeLessThanOrEqual(diagram.getBoundingClientRect().top,@@ -181,15 +182,14 @@ it('keeps a tall preview and its close button inside a narrow viewport', async (await userEvent.click(trigger)const dialog = page.getByRole('dialog', { name: 'Mermaid' })await expect.element(dialog.getByText('Step 0')).toBeVisible()- const bounds = dialog.element().getBoundingClientRect()- expect(bounds.left).toBeGreaterThanOrEqual(0)- expect(bounds.right).toBeLessThanOrEqual(320)- expect(bounds.top).toBeGreaterThanOrEqual(0)- expect(bounds.bottom).toBeLessThanOrEqual(568)+ for (const button of dialog.getByRole('button').elements()) {+ const rect = button.getBoundingClientRect()+ expect(rect.left).toBeGreaterThanOrEqual(0)+ expect(rect.right).toBeLessThanOrEqual(320)+ expect(rect.top).toBeGreaterThanOrEqual(0)+ expect(rect.bottom).toBeLessThanOrEqual(568)+ }const close = dialog.getByRole('button', { name: 'common.operation.close' })- const buttonBounds = close.element().getBoundingClientRect()- expect(buttonBounds.top).toBeGreaterThanOrEqual(0)- expect(buttonBounds.bottom).toBeLessThanOrEqual(568)await userEvent.click(close)await expect.element(dialog).not.toBeInTheDocument()})@@ -218,7 +218,6 @@ it('keeps the preview canvas fixed while the first zoom step enlarges the drawin)const initial = svg.getBoundingClientRect()const initialLabel = label.element().getBoundingClientRect().width- expect(initial.height).toBeGreaterThan(700)await userEvent.click(dialog.getByRole('button', { name: 'common.operation.zoomIn' }))const enlarged = svg.getBoundingClientRect()expect(enlarged.width).toBeCloseTo(initial.width, 0)@@ -245,10 +244,13 @@ it('copies a complete PNG after zooming and resets the success feedback', asyncconst dialog = page.getByRole('dialog', { name: 'Mermaid' })await expect.element(dialog.getByText('Start')).toBeVisible()await userEvent.click(dialog.getByRole('button', { name: 'common.operation.zoomIn' }))+ await userEvent.hover(dialog.getByRole('button', { name: 'common.operation.copyImage' }))+ await expect.element(page.getByText('common.operation.copyImage')).toBeVisible()await userEvent.click(dialog.getByRole('button', { name: 'common.operation.copyImage' }))await expect.element(dialog.getByRole('button', { name: 'common.operation.imageCopied' })).toBeEnabled()+ await expect.element(page.getByText('common.operation.imageCopied').last()).toBeVisible()expect(copied?.type).toBe('image/png')const bitmap = await createImageBitmap(copied!)expect(bitmap.width).toBeGreaterThan(50)@@ -307,7 +309,7 @@ it('announces a failed image copy and allows retrying', async () => {}})-it('shows a visual scrim when previewing from a transparent log-detail drawer and returns focus to it', async () => {+it('closes a nested preview without dismissing the log-detail drawer', async () => {await render(<Drawer defaultOpen swipeDirection="right"><DrawerPortal>@@ -326,18 +328,69 @@ it('shows a visual scrim when previewing from a transparent log-detail drawer anawait userEvent.click(trigger)const preview = page.getByRole('dialog', { name: 'Mermaid' })await expect.element(preview.getByText('Start')).toBeVisible()- // The visible scrim is distinct from Base UI's transparent interaction guard.- const scrims = [...document.querySelectorAll<HTMLElement>('[role="presentation"]')].filter(- (element) => getComputedStyle(element).backgroundColor !== 'rgba(0, 0, 0, 0)',- )- expect(scrims.length).toBe(1)- const scrim = scrims[0]!- await expect.poll(() => getComputedStyle(scrim).opacity).toBe('1')- const bounds = scrim.getBoundingClientRect()- expect(bounds.width).toBeGreaterThanOrEqual(window.innerWidth)- expect(bounds.height).toBeGreaterThanOrEqual(window.innerHeight)await userEvent.click(preview.getByRole('button', { name: 'common.operation.close' }))await expect.element(preview).not.toBeInTheDocument()await expect.element(parent).toBeVisible()await expect.element(trigger).toHaveFocus()})++it('switches preview action hints without leaking the inline hint into the dialog', async () => {+ const view = await render(+ <TooltipProvider delay={0} closeDelay={0}>+ <MermaidDiagram source={'flowchart LR\n A[Start] --> B[Finish]'} />+ </TooltipProvider>,+ )+ const inlineZoom = view.getByRole('button', { name: 'common.operation.zoomIn' })+ await expect.element(inlineZoom).toBeEnabled()+ await userEvent.hover(inlineZoom)+ await expect.element(page.getByText('common.operation.zoomIn')).toBeVisible()+ const preview = view.getByRole('button', { name: 'app.mermaid.preview' })+ await userEvent.click(preview)+ const dialog = page.getByRole('dialog', { name: 'Mermaid' })+ const zoomOut = dialog.getByRole('button', { name: 'common.operation.zoomOut' })+ await expect.element(zoomOut).toBeEnabled()+ await userEvent.hover(zoomOut)+ await expect.element(page.getByText('common.operation.zoomOut')).toBeVisible()+ await expect.element(page.getByText('common.operation.zoomIn')).not.toBeInTheDocument()+ const reset = dialog.getByRole('button', { name: 'common.operation.reset' })+ await userEvent.hover(reset)+ await expect.element(page.getByText('common.operation.reset')).toBeVisible()+ await expect.element(page.getByText('common.operation.zoomOut')).not.toBeInTheDocument()+ await userEvent.unhover(reset)+ await userEvent.click(zoomOut)+ await userEvent.keyboard('{Tab}')+ await expect.element(reset).toHaveFocus()+ await expect.element(page.getByText('common.operation.reset')).toBeVisible()+ await userEvent.click(dialog.getByRole('button', { name: 'common.operation.close' }))+ await expect.element(dialog).not.toBeInTheDocument()+ await expect.element(page.getByText('common.operation.reset')).not.toBeInTheDocument()+ await expect.element(preview).toHaveFocus()+})++it('focuses the drawing on open and reaches the first action in one Tab', async () => {+ await page.viewport(320, 568)+ const view = await render(<MermaidDiagram source={'flowchart TD\n A[Start] --> B[Finish]'} />)+ const trigger = view.getByRole('button', { name: 'app.mermaid.preview' })+ await expect.element(trigger).toBeEnabled()+ trigger.element().focus()+ await userEvent.keyboard('{Enter}')+ const dialog = page.getByRole('dialog', { name: 'Mermaid' })+ await expect.element(dialog.getByText('Start')).toBeVisible()+ const svg = dialog.getByText('Start').element().closest('svg')!+ await expect.element(svg).toHaveFocus()+ await expect.element(page.getByText('common.operation.close')).not.toBeInTheDocument()+ await userEvent.keyboard('{Tab}')+ await expect+ .element(dialog.getByRole('button', { name: 'common.operation.zoomIn' }))+ .toHaveFocus()+ await userEvent.keyboard('{Shift>}{Tab}{/Shift}')+ await expect.element(svg).toHaveFocus()+ const initialViewBox = svg.getAttribute('viewBox')+ await expect.element(page.getByText('common.operation.zoomIn')).not.toBeInTheDocument()+ await userEvent.keyboard('+++')+ expect(svg.getAttribute('viewBox')).not.toBe(initialViewBox)+ await expect.element(svg).toHaveFocus()+ await userEvent.keyboard('{Escape}')+ await expect.element(dialog).not.toBeInTheDocument()+ await expect.element(trigger).toHaveFocus()+})diff --git a/web/app/components/base/markdown-blocks/mermaid-diagram/__tests__/export.browser.spec.tsx b/web/app/components/base/markdown-blocks/mermaid-diagram/__tests__/export.browser.spec.tsxindex e1d1c08beed..e7d1520a5d8 100644--- a/web/app/components/base/markdown-blocks/mermaid-diagram/__tests__/export.browser.spec.tsx+++ b/web/app/components/base/markdown-blocks/mermaid-diagram/__tests__/export.browser.spec.tsx@@ -5,7 +5,7 @@ import { MermaidDiagram } from '..'vi.mock('@/utils/download', () => ({ downloadBlob: vi.fn() }))-it('downloads the complete themed drawing independently of the preview zoom and stage padding', async () => {+it('downloads the complete themed drawing independently of the preview zoom', async () => {document.documentElement.dataset.theme = 'dark'try {const view = await render(<MermaidDiagram source={'flowchart TD\n A[Start] --> B[Finish]'} />)@@ -26,7 +26,6 @@ it('downloads the complete themed drawing independently of the preview zoom andexpect(svg.getAttribute('viewBox')).toBe(`0 0 ${svg.getAttribute('width')} ${svg.getAttribute('height')}`,)- expect(svg.getAttribute('style')).toContain('--pele-bg:')const image = new Image()image.src = `data:image/svg+xml;charset=utf-8,${encodeURIComponent(await data.text())}`await image.decode()@@ -37,3 +36,37 @@ it('downloads the complete themed drawing independently of the preview zoom andvi.mocked(downloadBlob).mockClear()}})++it('opens a complete drawing in an isolated tab after preview zooming', async () => {+ const target = { document: document.implementation.createHTMLDocument(), opener: window }+ const open = vi.spyOn(window, 'open').mockReturnValue(target as unknown as Window)+ try {+ const view = await render(<MermaidDiagram source={'flowchart TD\n A[Start] --> B[Finish]'} />)+ const trigger = view.getByRole('button', { name: 'app.mermaid.preview' })+ await expect.element(trigger).toBeEnabled()+ await userEvent.click(trigger)+ const dialog = page.getByRole('dialog', { name: 'Mermaid' })+ await expect.element(dialog.getByText('Finish')).toBeVisible()+ await userEvent.click(dialog.getByRole('button', { name: 'common.operation.zoomIn' }))+ await userEvent.click(dialog.getByRole('button', { name: 'common.operation.openInNewTab' }))+ expect(open).toHaveBeenCalledOnce()+ expect(target.opener).toBeNull()+ const image = target.document.querySelector('img')!+ expect(image.alt).toBe('Mermaid')+ const exported = new DOMParser().parseFromString(+ decodeURIComponent(image.src.split(',')[1]!),+ 'image/svg+xml',+ ).documentElement+ expect(exported.textContent).toContain('Start')+ expect(exported.textContent).toContain('Finish')+ expect(exported.getAttribute('viewBox')).toBe(+ `0 0 ${exported.getAttribute('width')} ${exported.getAttribute('height')}`,+ )+ const loaded = new Image()+ loaded.src = image.src+ await loaded.decode()+ expect(loaded.naturalWidth).toBeGreaterThan(0)+ } finally {+ open.mockRestore()+ }+})diff --git a/web/app/components/base/markdown-blocks/mermaid-diagram/diagram-canvas.tsx b/web/app/components/base/markdown-blocks/mermaid-diagram/diagram-canvas.tsxdeleted file mode 100644index 582eaf3ff7d..00000000000--- a/web/app/components/base/markdown-blocks/mermaid-diagram/diagram-canvas.tsx+++ /dev/null@@ -1,33 +0,0 @@-import type { ReactNode } from 'react'-import styles from './diagram.module.css'-import { useDiagram } from './use-diagram'-import { ZoomControls } from './zoom-controls'--type DiagramCanvasProps = {- source: string- actions: ReactNode- onSourceRendered: (source: string) => void-}--export function DiagramCanvas({ source, actions, onSourceRendered }: DiagramCanvasProps) {- const diagram = useDiagram({ source, mode: 'inline', onRendered: onSourceRendered })- return (- <div className={styles.diagram}>- <div className="mb-2 flex items-center justify-end gap-1">- <ZoomControls disabled={!diagram.ready} zoomBy={diagram.zoomBy} reset={diagram.reset} />- {actions}- </div>- <div ref={diagram.stageRef}>- <div ref={diagram.canvasRef} className={styles.canvas} />- </div>- {diagram.error && (- <p- role="status"- className="mt-2 system-xs-regular whitespace-pre-wrap text-text-destructive"- >- {diagram.error}- </p>- )}- </div>- )-}diff --git a/web/app/components/base/markdown-blocks/mermaid-diagram/diagram-preview.tsx b/web/app/components/base/markdown-blocks/mermaid-diagram/diagram-preview.tsxnew file mode 100644index 00000000000..632fc902f0e--- /dev/null+++ b/web/app/components/base/markdown-blocks/mermaid-diagram/diagram-preview.tsx@@ -0,0 +1,244 @@+import { cn } from '@langgenius/dify-ui/cn'+import { DialogBackdrop, DialogClose, DialogPopup } from '@langgenius/dify-ui/dialog'+import { IconButton } from '@langgenius/dify-ui/icon-button'+import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'+import { useEffect, useRef, useState } from 'react'+import { useTranslation } from 'react-i18next'+import { downloadBlob } from '@/utils/download'+import { diagramTheme } from './diagram-theme'+import { diagramPng } from './export-diagram'+import { useDiagram } from './use-diagram'++export function DiagramPreview({ source }: { source: string }) {+ // A preview session keeps its drawing while the answer continues streaming.+ const [snapshot] = useState(source)+ const diagram = useDiagram({ source: snapshot, mode: 'preview' })++ return (+ <>+ {/* Full-screen previews need their own visual scrim inside transparent Drawers too. */}+ <DialogBackdrop forceRender className="bg-background-overlay-fullscreen" />+ <DialogPopup+ aria-label="Mermaid"+ className={cn(+ diagramTheme,+ 'fixed inset-0 flex w-full min-w-0 flex-col wrap-anywhere transition-opacity data-closed:pointer-events-none data-ending-style:scale-100 data-starting-style:scale-100',+ )}+ >+ <div ref={diagram.stageRef} className="flex min-h-0 flex-1 items-center">+ <div+ ref={diagram.canvasRef}+ className="mx-auto min-w-0 shrink-0 [&>svg]:mx-auto [&>svg]:block [&>svg:focus-visible]:outline-2 [&>svg:focus-visible]:-outline-offset-2 [&>svg:focus-visible]:outline-text-accent"+ />+ </div>+ <DiagramPreviewActions+ ready={diagram.ready}+ zoomBy={diagram.zoomBy}+ reset={diagram.reset}+ exportSvg={diagram.exportSvg}+ />+ {diagram.error && (+ <p role="status" className="mt-2 system-xs-regular text-text-destructive">+ {diagram.error}+ </p>+ )}+ </DialogPopup>+ </>+ )+}++type DiagramPreviewActionsProps = Pick<+ ReturnType<typeof useDiagram>,+ 'ready' | 'zoomBy' | 'reset' | 'exportSvg'+>++function DiagramPreviewActions({ ready, zoomBy, reset, exportSvg }: DiagramPreviewActionsProps) {+ const { t } = useTranslation(['common'])+ const [copyState, setCopyState] = useState<'idle' | 'success' | 'error'>('idle')+ const copyingRef = useRef(false)+ useEffect(() => {+ if (copyState !== 'success') return+ const timeout = setTimeout(() => setCopyState('idle'), 2000)+ return () => clearTimeout(timeout)+ }, [copyState])+ const status =+ copyState === 'success'+ ? t(($) => $['operation.imageCopied'])+ : copyState === 'error'+ ? t(($) => $['operation.imageCopyFailed'])+ : ''++ const copyImage = async () => {+ const svg = exportSvg()+ if (!svg || copyingRef.current) return+ copyingRef.current = true+ setCopyState('idle')+ try {+ const png = diagramPng(svg)+ // Consume encoding failures even when the browser rejects clipboard access first.+ void png.catch(() => {})+ await navigator.clipboard.write([new ClipboardItem({ 'image/png': png })])+ setCopyState('success')+ } catch {+ setCopyState('error')+ } finally {+ copyingRef.current = false+ }+ }++ const downloadImage = () => {+ const svg = exportSvg()+ if (!svg) return+ downloadBlob({+ data: new Blob([svg], { type: 'image/svg+xml' }),+ fileName: 'mermaid.svg',+ })+ }++ const openImage = () => {+ const svg = exportSvg()+ if (!svg) return+ const target = window.open()+ if (!target) return+ target.opener = null+ target.document.title = 'Mermaid'+ const image = target.document.createElement('img')+ image.alt = 'Mermaid'+ image.src = `data:image/svg+xml;charset=utf-8,${encodeURIComponent(svg)}`+ target.document.body.append(image)+ }++ const copyLabel =+ copyState === 'success'+ ? t(($) => $['operation.imageCopied'])+ : t(($) => $['operation.copyImage'])+ const downloadLabel = t(($) => $['operation.download'])+ const openLabel = t(($) => $['operation.openInNewTab'])++ const zoomInLabel = t(($) => $['operation.zoomIn'])+ const zoomOutLabel = t(($) => $['operation.zoomOut'])+ const resetLabel = t(($) => $['operation.reset'])++ const closeLabel = t(($) => $['operation.close'])++ return (+ <Tooltip<string>>+ {({ payload }) => (+ <>+ <div className="absolute top-4 right-4 sm:top-8 sm:right-8">+ <div+ aria-hidden+ className="pointer-events-none absolute -top-2 -right-2 -bottom-6 -left-8 bg-[radial-gradient(ellipse_at_top_right,var(--color-background-overlay-fullscreen)_45%,transparent_75%)]"+ />+ <div className="relative flex items-center gap-1">+ <TooltipTrigger+ payload={zoomInLabel}+ render={+ <IconButton+ size="lg"+ aria-label={zoomInLabel}+ disabled={!ready}+ onClick={() => zoomBy(1.25)}+ >+ <span aria-hidden className="i-ri-add-line size-4" />+ </IconButton>+ }+ />+ <TooltipTrigger+ payload={zoomOutLabel}+ render={+ <IconButton+ size="lg"+ aria-label={zoomOutLabel}+ disabled={!ready}+ onClick={() => zoomBy(0.8)}+ >+ <span aria-hidden className="i-ri-subtract-line size-4" />+ </IconButton>+ }+ />+ <TooltipTrigger+ payload={resetLabel}+ render={+ <IconButton size="lg" aria-label={resetLabel} disabled={!ready} onClick={reset}>+ <span aria-hidden className="i-ri-restart-line size-4" />+ </IconButton>+ }+ />+ <span+ role="status"+ className={+ copyState === 'error'+ ? 'absolute top-full right-0 rounded-md bg-components-panel-bg px-2 py-1 system-xs-regular text-text-destructive'+ : 'sr-only'+ }+ >+ {status}+ </span>+ <TooltipTrigger+ payload={copyLabel}+ closeOnClick={false}+ render={+ <IconButton+ size="lg"+ aria-label={copyLabel}+ disabled={!ready}+ onClick={copyImage}+ >+ <span+ aria-hidden+ className={+ copyState === 'success'+ ? 'i-ri-check-line size-4'+ : 'i-ri-file-copy-line size-4'+ }+ />+ </IconButton>+ }+ />+ <TooltipTrigger+ payload={downloadLabel}+ render={+ <IconButton+ size="lg"+ aria-label={downloadLabel}+ disabled={!ready}+ onClick={downloadImage}+ >+ <span aria-hidden className="i-ri-download-cloud-2-line size-4" />+ </IconButton>+ }+ />+ <TooltipTrigger+ payload={openLabel}+ render={+ <IconButton+ size="lg"+ aria-label={openLabel}+ disabled={!ready}+ onClick={openImage}+ >+ <span aria-hidden className="i-ri-external-link-line size-4" />+ </IconButton>+ }+ />+ <TooltipTrigger+ payload={closeLabel}+ render={+ <DialogClose+ render={+ <IconButton size="lg" aria-label={closeLabel}>+ <span aria-hidden className="i-ri-close-line size-4" />+ </IconButton>+ }+ />+ }+ />+ </div>+ </div>+ <TooltipContent>{payload}</TooltipContent>+ </>+ )}+ </Tooltip>+ )+}diff --git a/web/app/components/base/markdown-blocks/mermaid-diagram/diagram-theme.ts b/web/app/components/base/markdown-blocks/mermaid-diagram/diagram-theme.tsnew file mode 100644index 00000000000..9f8b5542fe6--- /dev/null+++ b/web/app/components/base/markdown-blocks/mermaid-diagram/diagram-theme.ts@@ -0,0 +1,2 @@+export const diagramTheme =+ '[--pele-bg:var(--color-components-panel-bg)] [--pele-fg:var(--color-text-primary)] [--pele-muted:var(--color-text-tertiary)] [--pele-line:var(--color-text-secondary)] [--pele-surface:var(--color-background-section)] [--pele-surface-alt:var(--color-background-section-burn)] [--pele-border:var(--color-text-tertiary)] [--pele-accent:var(--color-text-accent)] [--pele-critical:var(--color-text-destructive)] [--pele-error:var(--color-text-destructive)]'diff --git a/web/app/components/base/markdown-blocks/mermaid-diagram/diagram.module.css b/web/app/components/base/markdown-blocks/mermaid-diagram/diagram.module.cssdeleted file mode 100644index d6be76dfa06..00000000000--- a/web/app/components/base/markdown-blocks/mermaid-diagram/diagram.module.css+++ /dev/null@@ -1,38 +0,0 @@-.diagram {- --pele-bg: var(--color-components-panel-bg);- --pele-fg: var(--color-text-primary);- --pele-muted: var(--color-text-tertiary);- --pele-line: var(--color-text-secondary);- --pele-surface: var(--color-background-section);- --pele-surface-alt: var(--color-background-section-burn);- --pele-border: var(--color-text-tertiary);- --pele-accent: var(--color-text-accent);- --pele-critical: var(--color-text-destructive);- --pele-error: var(--color-text-destructive);-- width: 100%;- min-width: 0;- overflow-wrap: anywhere;-}--.diagram :global(svg:focus-visible) {- outline: 2px solid var(--color-text-accent);- outline-offset: 2px;-}--.canvas {- min-width: 0;- margin-inline: auto;- flex-shrink: 0;-}--.canvas > :global(svg) {- display: block;- margin-inline: auto;-}--.previewActions {- --color-text-tertiary: var(--color-text-primary-on-surface);- --color-text-secondary: var(--color-text-primary-on-surface);- --color-state-base-hover: var(--color-state-base-hover-alt);-}diff --git a/web/app/components/base/markdown-blocks/mermaid-diagram/export-actions.tsx b/web/app/components/base/markdown-blocks/mermaid-diagram/export-actions.tsxdeleted file mode 100644index 02c66dc48a4..00000000000--- a/web/app/components/base/markdown-blocks/mermaid-diagram/export-actions.tsx+++ /dev/null@@ -1,118 +0,0 @@-import { cn } from '@langgenius/dify-ui/cn'-import { IconButton } from '@langgenius/dify-ui/icon-button'-import { useEffect, useState } from 'react'-import { useTranslation } from 'react-i18next'-import { downloadBlob } from '@/utils/download'-import { diagramPng } from './export-diagram'--type ExportActionsProps = {- exportSvg: () => string | null- disabled: boolean-}--export function ExportActions({ exportSvg, disabled }: ExportActionsProps) {- const { t } = useTranslation(['common'])- const [copyState, setCopyState] = useState<'idle' | 'pending' | 'success' | 'error'>('idle')- useEffect(() => {- if (copyState !== 'success') return- const timeout = setTimeout(() => setCopyState('idle'), 2000)- return () => clearTimeout(timeout)- }, [copyState])- const copying = copyState === 'pending'- const status =- copyState === 'success'- ? t(($) => $['operation.imageCopied'])- : copyState === 'error'- ? t(($) => $['operation.imageCopyFailed'])- : ''-- const copy = async () => {- const svg = exportSvg()- if (!svg || copying) return- setCopyState('pending')- try {- const png = diagramPng(svg)- // Consume encoding failures even when the browser rejects clipboard access first.- void png.catch(() => {})- await navigator.clipboard.write([new ClipboardItem({ 'image/png': png })])- setCopyState('success')- } catch {- setCopyState('error')- }- }-- const download = () => {- const svg = exportSvg()- if (!svg) return- downloadBlob({- data: new Blob([svg], { type: 'image/svg+xml' }),- fileName: 'mermaid.svg',- })- }-- const open = () => {- const svg = exportSvg()- if (!svg) return- const target = window.open()- if (!target) return- target.opener = null- target.document.title = 'Mermaid'- const image = target.document.createElement('img')- image.alt = 'Mermaid'- image.src = `data:image/svg+xml;charset=utf-8,${encodeURIComponent(svg)}`- target.document.body.append(image)- }-- return (- <>- <span- role="status"- className={cn(- copyState === 'error'- ? 'absolute top-full right-0 rounded-md bg-components-panel-bg px-2 py-1 system-xs-regular text-text-destructive'- : 'sr-only',- )}- >- {status}- </span>- <IconButton- size="lg"- aria-label={- copyState === 'success'- ? t(($) => $['operation.imageCopied'])- : t(($) => $['operation.copyImage'])- }- disabled={disabled || copying}- focusableWhenDisabled={copying}- onClick={copy}- >- <span- aria-hidden- className={- copying- ? 'i-ri-loader-4-line size-4 animate-spin motion-reduce:animate-none'- : copyState === 'success'- ? 'i-ri-check-line size-4'- : 'i-ri-file-copy-line size-4'- }- />- </IconButton>- <IconButton- size="lg"- aria-label={t(($) => $['operation.download'])}- disabled={disabled}- onClick={download}- >- <span aria-hidden className="i-ri-download-cloud-2-line size-4" />- </IconButton>- <IconButton- size="lg"- aria-label={t(($) => $['operation.openInNewTab'])}- disabled={disabled}- onClick={open}- >- <span aria-hidden className="i-ri-external-link-line size-4" />- </IconButton>- </>- )-}diff --git a/web/app/components/base/markdown-blocks/mermaid-diagram/index.stories.tsx b/web/app/components/base/markdown-blocks/mermaid-diagram/index.stories.tsxindex 7e88310d96c..355958fff01 100644--- a/web/app/components/base/markdown-blocks/mermaid-diagram/index.stories.tsx+++ b/web/app/components/base/markdown-blocks/mermaid-diagram/index.stories.tsx@@ -1,4 +1,5 @@import type { Meta, StoryObj } from '@storybook/nextjs-vite'+import { TooltipProvider } from '@langgenius/dify-ui/tooltip'import { MermaidDiagram } from '.'const meta = {@@ -11,7 +12,9 @@ const meta = {decorators: [(Story) => (<div className="w-full max-w-3xl">- <Story />+ <TooltipProvider delay={300} closeDelay={200}>+ <Story />+ </TooltipProvider></div>),],diff --git a/web/app/components/base/markdown-blocks/mermaid-diagram/index.tsx b/web/app/components/base/markdown-blocks/mermaid-diagram/index.tsxindex 13170596237..f76c5ffcc07 100644--- a/web/app/components/base/markdown-blocks/mermaid-diagram/index.tsx+++ b/web/app/components/base/markdown-blocks/mermaid-diagram/index.tsx@@ -2,101 +2,101 @@import { Button } from '@langgenius/dify-ui/button'import { cn } from '@langgenius/dify-ui/cn'-import {- Dialog,- DialogBackdrop,- DialogClose,- DialogPopup,- DialogPortal,- DialogTrigger,- DialogViewport,-} from '@langgenius/dify-ui/dialog'+import { Dialog, DialogPortal, DialogTrigger } from '@langgenius/dify-ui/dialog'import { IconButton } from '@langgenius/dify-ui/icon-button'+import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'import { useState } from 'react'import { useTranslation } from 'react-i18next'-import { DiagramCanvas } from './diagram-canvas'-import styles from './diagram.module.css'-import { ExportActions } from './export-actions'+import { DiagramPreview } from './diagram-preview'+import { diagramTheme } from './diagram-theme'import { useDiagram } from './use-diagram'-import { ZoomControls } from './zoom-controls'export function MermaidDiagram({ source }: { source: string }) {- const { t } = useTranslation(['app'])+ const { t } = useTranslation(['common', 'app'])const [previewSource, setPreviewSource] = useState('')+ const diagram = useDiagram({ source, mode: 'inline', onRendered: setPreviewSource })+ const zoomInLabel = t(($) => $['operation.zoomIn'])+ const zoomOutLabel = t(($) => $['operation.zoomOut'])+ const resetLabel = t(($) => $['operation.reset'])return (<Dialog disablePointerDismissal><div className="min-w-0 rounded-b-xl bg-components-panel-bg p-3">- <DiagramCanvas- source={source}- onSourceRendered={setPreviewSource}- actions={- <DialogTrigger- disabled={!previewSource}- render={<Button size="small" variant="ghost" />}- >- <span aria-hidden className="i-ri-fullscreen-line size-4" />- {t(($) => $['mermaid.preview'], { ns: 'app' })}- </DialogTrigger>- }- />- </div>- <DialogPortal>- <DiagramPreview source={previewSource} />- </DialogPortal>- </Dialog>- )-}--function DiagramPreview({ source }: { source: string }) {- const { t } = useTranslation(['common'])- // A preview session keeps its drawing while the answer continues streaming.- const [snapshot] = useState(source)- const diagram = useDiagram({ source: snapshot, mode: 'preview' })- return (- <>- {/* Full-screen previews need their own visual scrim inside transparent Drawers too. */}- <DialogBackdrop forceRender />- <DialogViewport className="p-4 sm:p-8">- <DialogPopup- aria-label="Mermaid"- className={cn(- styles.diagram,- 'pointer-events-none flex h-full min-h-0 flex-col transition-opacity data-ending-style:scale-100 data-starting-style:scale-100',- )}- >- <div- className={cn(- styles.previewActions,- 'pointer-events-auto relative mb-2 flex shrink-0 items-center justify-end gap-1 self-end',+ <div className={cn(diagramTheme, 'w-full min-w-0 wrap-anywhere')}>+ <Tooltip<string>>+ {({ payload }) => (+ <>+ <div className="mb-2 flex items-center justify-end gap-1">+ <TooltipTrigger+ payload={zoomInLabel}+ render={+ <IconButton+ size="lg"+ aria-label={zoomInLabel}+ disabled={!diagram.ready}+ onClick={() => diagram.zoomBy(1.25)}+ >+ <span aria-hidden className="i-ri-add-line size-4" />+ </IconButton>+ }+ />+ <TooltipTrigger+ payload={zoomOutLabel}+ render={+ <IconButton+ size="lg"+ aria-label={zoomOutLabel}+ disabled={!diagram.ready}+ onClick={() => diagram.zoomBy(0.8)}+ >+ <span aria-hidden className="i-ri-subtract-line size-4" />+ </IconButton>+ }+ />+ <TooltipTrigger+ payload={resetLabel}+ render={+ <IconButton+ size="lg"+ aria-label={resetLabel}+ disabled={!diagram.ready}+ onClick={diagram.reset}+ >+ <span aria-hidden className="i-ri-restart-line size-4" />+ </IconButton>+ }+ />+ <DialogTrigger+ disabled={!previewSource}+ render={<Button size="small" variant="ghost" />}+ >+ <span aria-hidden className="i-ri-fullscreen-line size-4" />+ {t(($) => $['mermaid.preview'], { ns: 'app' })}+ </DialogTrigger>+ </div>+ <TooltipContent>{payload}</TooltipContent>+ </>)}- >- <ZoomControls disabled={!diagram.ready} zoomBy={diagram.zoomBy} reset={diagram.reset} />- <ExportActions exportSvg={diagram.exportSvg} disabled={!diagram.ready} />- <DialogClose- render={- <IconButton size="lg" aria-label={t(($) => $['operation.close'])}>- <span aria-hidden className="i-ri-close-line size-4" />- </IconButton>- }- />- </div>- <div ref={diagram.stageRef} className="flex min-h-0 flex-1 items-center">+ </Tooltip>+ <div ref={diagram.stageRef}><divref={diagram.canvasRef}- className={cn(styles.canvas, 'pointer-events-auto bg-components-panel-bg')}+ className="mx-auto min-w-0 shrink-0 [&>svg]:mx-auto [&>svg]:block [&>svg:focus-visible]:outline-2 [&>svg:focus-visible]:outline-offset-2 [&>svg:focus-visible]:outline-text-accent"/></div>{diagram.error && (<prole="status"- className="pointer-events-auto mt-2 system-xs-regular text-text-destructive"+ className="mt-2 system-xs-regular whitespace-pre-wrap text-text-destructive">{diagram.error}</p>)}- </DialogPopup>- </DialogViewport>- </>+ </div>+ </div>+ <DialogPortal>+ <DiagramPreview source={previewSource} />+ </DialogPortal>+ </Dialog>)}diff --git a/web/app/components/base/markdown-blocks/mermaid-diagram/use-diagram.ts b/web/app/components/base/markdown-blocks/mermaid-diagram/use-diagram.tsindex 4b407fab461..34ebe9d032e 100644--- a/web/app/components/base/markdown-blocks/mermaid-diagram/use-diagram.ts+++ b/web/app/components/base/markdown-blocks/mermaid-diagram/use-diagram.ts@@ -1,7 +1,7 @@import type { Zoom } from 'pele'import DOMPurify from 'dompurify'import { enableZoom, forgetTextWidths, parse, render } from 'pele'-import { useEffect, useEffectEvent, useId, useRef, useState } from 'react'+import { useEffect, useEffectEvent, useId, useLayoutEffect, useRef, useState } from 'react'import { serializeDiagram } from './export-diagram'type DiagramOptions = {@@ -18,7 +18,7 @@ export function useDiagram({ source, mode, onRendered }: DiagramOptions) {const id = useId()const [result, setResult] = useState({ ready: false, error: '' })const reportSource = useEffectEvent((renderedSource: string) => onRendered?.(renderedSource))- useEffect(() => {+ useLayoutEffect(() => {const container = canvasRef.currentconst stage = stageRef.currentif (!container || !stage) return@@ -108,7 +108,9 @@ export function useDiagram({ source, mode, onRendered }: DiagramOptions) {schedule()})observer.observe(stage)- schedule()+ // The preview SVG must exist before Dialog chooses its initial focus target.+ if (mode === 'preview') draw()+ else schedule()const fontsLoaded = () => {if (disposed) returnforgetTextWidths()diff --git a/web/app/components/base/markdown-blocks/mermaid-diagram/zoom-controls.tsx b/web/app/components/base/markdown-blocks/mermaid-diagram/zoom-controls.tsxdeleted file mode 100644index 4a0a2b34cc3..00000000000--- a/web/app/components/base/markdown-blocks/mermaid-diagram/zoom-controls.tsx+++ /dev/null@@ -1,40 +0,0 @@-import { IconButton } from '@langgenius/dify-ui/icon-button'-import { useTranslation } from 'react-i18next'--type ZoomControlsProps = {- disabled: boolean- zoomBy: (factor: number) => void- reset: () => void-}--export function ZoomControls({ disabled, zoomBy, reset }: ZoomControlsProps) {- const { t } = useTranslation(['common'])- return (- <>- <IconButton- size="lg"- aria-label={t(($) => $['operation.zoomIn'])}- disabled={disabled}- onClick={() => zoomBy(1.25)}- >- <span aria-hidden className="i-ri-add-line size-4" />- </IconButton>- <IconButton- size="lg"- aria-label={t(($) => $['operation.zoomOut'])}- disabled={disabled}- onClick={() => zoomBy(0.8)}- >- <span aria-hidden className="i-ri-subtract-line size-4" />- </IconButton>- <IconButton- size="lg"- aria-label={t(($) => $['operation.reset'])}- disabled={disabled}- onClick={reset}- >- <span aria-hidden className="i-ri-restart-line size-4" />- </IconButton>- </>- )-}