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

cleanAndMerge pieConfig

Browse Source
This commit is contained in:
Reda Al Sulais
2023-08-11 03:55:04 +03:00
parent 1721282182
commit 8a8e062342
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/mermaid/src/diagrams/pie/pieRenderer.ts
View File

@@ -3,7 +3,7 @@ import d3, { scaleOrdinal, pie as d3pie, arc } from 'd3';
import { log } from '../../logger.js'; import { log } from '../../logger.js';
import { configureSvgSize } from '../../setupGraphViewbox.js'; import { configureSvgSize } from '../../setupGraphViewbox.js';
import { getConfig } from '../../config.js'; import { getConfig } from '../../config.js';
import { parseFontSize } from '../../utils.js'; import { cleanAndMerge, parseFontSize } from '../../utils.js';
import type { DrawDefinition, Group, SVG } from '../../diagram-api/types.js'; import type { DrawDefinition, Group, SVG } from '../../diagram-api/types.js';
import type { D3Sections, PieDB, Sections } from './pieTypes.js'; import type { D3Sections, PieDB, Sections } from './pieTypes.js';
import type { MermaidConfig, PieDiagramConfig } from '../../config.type.js'; import type { MermaidConfig, PieDiagramConfig } from '../../config.type.js';
@@ -38,7 +38,7 @@ export const draw: DrawDefinition = (text, id, _version, diagObj) => {
const db = diagObj.db as PieDB; const db = diagObj.db as PieDB;
const globalConfig: MermaidConfig = getConfig(); const globalConfig: MermaidConfig = getConfig();
const pieConfig: Required<PieDiagramConfig> = db.getConfig(); const pieConfig: Required<PieDiagramConfig> = cleanAndMerge(db.getConfig(), globalConfig.pie);
const height = 450; const height = 450;
// TODO: remove document width // TODO: remove document width
@@ -47,7 +47,7 @@ export const draw: DrawDefinition = (text, id, _version, diagObj) => {
const svg: SVG = selectSvgElement(id); const svg: SVG = selectSvgElement(id);
// Set viewBox // Set viewBox
svg.attr('viewBox', `0 0 ${width} ${height}`); svg.attr('viewBox', `0 0 ${width} ${height}`);
configureSvgSize(svg, height, width, globalConfig?.pie?.useMaxWidth ?? true); configureSvgSize(svg, height, width, pieConfig.useMaxWidth);
const MARGIN = 40; const MARGIN = 40;
const LEGEND_RECT_SIZE = 18; const LEGEND_RECT_SIZE = 18;