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

This commit is contained in:
Knut Sveidqvist
2024-06-18 11:16:28 +02:00

View File

@@ -806,7 +806,8 @@ const addNodeFromVertex = (
labelStyle: '', labelStyle: '',
parentId, parentId,
padding: config.flowchart?.padding || 8, padding: config.flowchart?.padding || 8,
cssStyles: vertex.styles.join(' '), cssStyles: vertex.styles,
cssCompiledStyles: getCompiledStyles(vertex.classes),
cssClasses: vertex.classes.join(' '), cssClasses: vertex.classes.join(' '),
shape: getTypeFromVertex(vertex), shape: getTypeFromVertex(vertex),
dir: vertex.dir, dir: vertex.dir,
@@ -820,6 +821,22 @@ const addNodeFromVertex = (
} }
}; };
function getCompiledStyles(classDefs: string[]) {
let compiledStyles: string[] = [];
for (const customClass of classDefs) {
const cssClass = classes.get(customClass);
if (cssClass) {
if (cssClass.styles) {
compiledStyles = [...compiledStyles, ...(cssClass.styles ?? [])];
}
if (cssClass.textStyles) {
compiledStyles = [...compiledStyles, ...(cssClass.textStyles ?? [])];
}
}
}
return compiledStyles;
}
export const getData = () => { export const getData = () => {
const config = getConfig(); const config = getConfig();
const nodes: Node[] = []; const nodes: Node[] = [];
@@ -844,7 +861,7 @@ export const getData = () => {
labelStyle: '', labelStyle: '',
parentId: parentDB.get(subGraph.id), parentId: parentDB.get(subGraph.id),
padding: config.flowchart?.padding || 8, padding: config.flowchart?.padding || 8,
cssStyles: '', cssStyles: [],
cssClasses: '', cssClasses: '',
shape: 'rect', shape: 'rect',
dir: subGraph.dir, dir: subGraph.dir,