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

Update text logic and change workaround for markdown

Browse Source
This commit is contained in:
yari-dewalt
2024-09-18 12:54:32 -07:00
parent 745495c2d5
commit 25337dc453
3 changed files with 12 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
packages/mermaid/src/diagrams/class/classTypes.ts
View File

@@ -123,42 +123,13 @@ export class ClassMember {
} }
this.classifier = potentialClassifier; this.classifier = potentialClassifier;
// TODO: Right now getting rid of spacing in id / name, TODO: Add optional spacing // Preserve one space only
const combinedText = `${this.visibility}${this.id}${this.memberType === 'method' ? `(${this.parameters})${this.returnType ? ' : ' + this.returnType : ''}` : ''}`; this.id = this.id.startsWith(' ') ? ' ' + this.id.trim() : this.id.trim();
this.text = combinedText;
if (combinedText.includes('~')) {
const numOfTildes = (combinedText.substring(1).match(/~/g) ?? []).length;
let count = numOfTildes;
if (count !== 1) {
const odd = count % 2 > 0;
// Replace all '~' with '>' const combinedText = `${this.visibility ? '\\' + this.visibility : ''}${parseGenericTypes(this.id)}${this.memberType === 'method' ? `(${parseGenericTypes(this.parameters)})${this.returnType ? ' : ' + parseGenericTypes(this.returnType) : ''}` : ''}`;
let replacedRaw = combinedText.substring(1).replaceAll('~', '&gt;'); this.text = combinedText.replaceAll('<', '&lt;').replaceAll('>', '&gt;');
if (this.text.startsWith('\\&lt;')) {
// Replace the first half of '>' with '<' this.text = this.text.replace('\\&lt;', '~');
while (count > 0) {
replacedRaw = replacedRaw.replace('&gt;', '&lt;');
count -= 2; // Each iteration replaces one '>' with '<', so reduce count by 2
}
if (odd) {
// Replace first occurrence.
if (this.memberType === 'method') {
replacedRaw = replacedRaw.replace('&lt;', '~');
} else {
// Replace middle occurrence.
const ltOccurrences = replacedRaw.match(/&lt;/g) ?? [];
if (ltOccurrences.length > 1) {
let ltCount = 0;
replacedRaw = replacedRaw.replace('&lt;', (match) => {
ltCount++;
return ltCount === ltOccurrences.length ? '~' : match;
});
}
}
}
this.text = this.text.charAt(0) + replacedRaw;
}
} }
} }

7
packages/mermaid/src/diagrams/class/shapeUtil.ts
View File

@@ -109,6 +109,12 @@ const addText = async (
textContent = node.label!; textContent = node.label!;
} }
// createText() will cause unwanted behavior because of classDiagram syntax so workarounds are needed
if (!useHtmlLabels && textContent.startsWith('\\')) {
textContent = textContent.substring(1);
}
if (hasKatex(textContent)) { if (hasKatex(textContent)) {
useHtmlLabels = true; useHtmlLabels = true;
} }
@@ -126,7 +132,6 @@ const addText = async (
let bbox; let bbox;
let numberOfLines = 1; let numberOfLines = 1;
// createText() creates unwanted behavior because of syntax, so fix
if (!useHtmlLabels) { if (!useHtmlLabels) {
// Undo font-weight // Undo font-weight
select(text).selectAll('tspan').attr('font-weight', ''); select(text).selectAll('tspan').attr('font-weight', '');

2
packages/mermaid/src/rendering-util/handle-markdown-text.ts
View File

@@ -87,8 +87,6 @@ export function markdownToHTML(markdown: string, { markdownAutoWrap }: MermaidCo
return `${node.text}`; return `${node.text}`;
} else if (node.type === 'escape') { } else if (node.type === 'escape') {
return node.text; return node.text;
} else if (node.type === 'list') {
return node.raw;
} }
return `Unsupported markdown: ${node.type}`; return `Unsupported markdown: ${node.type}`;
} }