marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-09-24 01:39:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5237-unified-layout-common-renderer' of github.com:mermaid-js/mermaid into 5237-unified-layout-common-renderer

Browse Source
This commit is contained in:
Knut Sveidqvist
2024-06-25 09:59:32 +02:00
parent 469acbe810 cfacd3b2e1
commit 881a68241c
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/mermaid/src/rendering-util/createText.ts
View File

@@ -8,7 +8,7 @@ import { markdownToHTML, markdownToLines } from '../rendering-util/handle-markdo
import { decodeEntities } from '../utils.js'; import { decodeEntities } from '../utils.js';
import { splitLineToFitWidth } from './splitText.js'; import { splitLineToFitWidth } from './splitText.js';
import type { MarkdownLine, MarkdownWord } from './types.js'; import type { MarkdownLine, MarkdownWord } from './types.js';
import common, { renderKatex } from '$root/diagrams/common/common.js'; import common, { hasKatex, renderKatex, hasKatex } from '$root/diagrams/common/common.js';
import { getConfig } from '$root/diagram-api/diagramAPI.js'; import { getConfig } from '$root/diagram-api/diagramAPI.js';
function applyStyle(dom, styleFn) { function applyStyle(dom, styleFn) {
@@ -20,11 +20,8 @@ function applyStyle(dom, styleFn) {
async function addHtmlSpan(element, node, width, classes, addBackground = false) { async function addHtmlSpan(element, node, width, classes, addBackground = false) {
const fo = element.append('foreignObject'); const fo = element.append('foreignObject');
const div = fo.append('xhtml:div'); const div = fo.append('xhtml:div');
let label = node.label;
// const label = node.label; if (node.label && hasKatex(node.label)) {
let label = '';
if (node.label) {
label = await renderKatex(node.label.replace(common.lineBreakRegex, '\n'), getConfig()); label = await renderKatex(node.label.replace(common.lineBreakRegex, '\n'), getConfig());
} }
const labelClass = node.isNode ? 'nodeLabel' : 'edgeLabel'; const labelClass = node.isNode ? 'nodeLabel' : 'edgeLabel';

4
packages/mermaid/src/rendering-util/rendering-elements/createLabel.js
View File

@@ -1,7 +1,7 @@
import { select } from 'd3'; import { select } from 'd3';
import { log } from '$root/logger.js'; import { log } from '$root/logger.js';
import { getConfig } from '$root/diagram-api/diagramAPI.js'; import { getConfig } from '$root/diagram-api/diagramAPI.js';
import common, { evaluate, renderKatex } from '$root/diagrams/common/common.js'; import common, { evaluate, renderKatex, hasKatex } from '$root/diagrams/common/common.js';
import { decodeEntities } from '$root/utils.js'; import { decodeEntities } from '$root/utils.js';
/** /**
@@ -23,7 +23,7 @@ async function addHtmlLabel(node) {
const div = fo.append('xhtml:div'); const div = fo.append('xhtml:div');
let label = node.label; let label = node.label;
if (node.label) { if (node.label && hasKatex(node.label)) {
label = await renderKatex(node.label.replace(common.lineBreakRegex, '\n'), getConfig()); label = await renderKatex(node.label.replace(common.lineBreakRegex, '\n'), getConfig());
} }
const labelClass = node.isNode ? 'nodeLabel' : 'edgeLabel'; const labelClass = node.isNode ? 'nodeLabel' : 'edgeLabel';