GitHub/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-01-28 07:03:17 +08:00
Code Issues Projects Releases Wiki Activity

fix: use maps for quadrant diagrams

Browse Source
This commit is contained in:
Yash Singh 2024-04-17 10:25:54 -07:00
parent 357da0ca28
commit 128c69aa76
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/mermaid/src/diagrams/quadrant-chart/parser/quadrant.jison.spec.ts
View File

@ -2,6 +2,7 @@
import { parser } from './quadrant.jison'; import { parser } from './quadrant.jison';
import type { Mock } from 'vitest'; import type { Mock } from 'vitest';
import { vi } from 'vitest'; import { vi } from 'vitest';
import { addClass } from '../../flowchart/flowDb.js';
const parserFnConstructor = (str: string) => { const parserFnConstructor = (str: string) => {
return () => { return () => {
@ -20,6 +21,7 @@ const mockDB: Record<string, Mock<any, any>> = {
setYAxisBottomText: vi.fn(), setYAxisBottomText: vi.fn(),
setDiagramTitle: vi.fn(), setDiagramTitle: vi.fn(),
addPoint: vi.fn(), addPoint: vi.fn(),
addClass: vi.fn(),
}; };
function clearMocks() { function clearMocks() {
@ -423,4 +425,13 @@ describe('Testing quadrantChart jison file', () => {
['stroke-width: 10px'] ['stroke-width: 10px']
); );
}); });
it('should be able to handle constructor as a className', () => {
const str = `quadrantChart
classDef constructor fill:#ff0000
Microsoft:::constructor: [0.75, 0.75]
`;
expect(parserFnConstructor(str)).not.toThrow();
expect(mockDB.addClass).toHaveBeenCalledWith('constructor', ['fill:#ff0000']);
});
}); });

8
packages/mermaid/src/diagrams/quadrant-chart/quadrantBuilder.ts
View File

@ -127,7 +127,7 @@ export class QuadrantBuilder {
private config: QuadrantBuilderConfig; private config: QuadrantBuilderConfig;
private themeConfig: QuadrantBuilderThemeConfig; private themeConfig: QuadrantBuilderThemeConfig;
private data: QuadrantBuilderData; private data: QuadrantBuilderData;
private classes: Record<string, StylesObject> = {}; private classes: Map<string, StylesObject> = new Map();
constructor() { constructor() {
this.config = this.getDefaultConfig(); this.config = this.getDefaultConfig();
@ -202,7 +202,7 @@ export class QuadrantBuilder {
this.config = this.getDefaultConfig(); this.config = this.getDefaultConfig();
this.themeConfig = this.getDefaultThemeConfig(); this.themeConfig = this.getDefaultThemeConfig();
this.data = this.getDefaultData(); this.data = this.getDefaultData();
this.classes = {}; this.classes = new Map();
log.info('clear called'); log.info('clear called');
} }
@ -215,7 +215,7 @@ export class QuadrantBuilder {
} }
addClass(className: string, styles: StylesObject) { addClass(className: string, styles: StylesObject) {
this.classes[className] = styles; this.classes.set(className, styles);
} }
setConfig(config: Partial<QuadrantBuilderConfig>) { setConfig(config: Partial<QuadrantBuilderConfig>) {
@ -486,7 +486,7 @@ export class QuadrantBuilder {
.range([quadrantHeight + quadrantTop, quadrantTop]); .range([quadrantHeight + quadrantTop, quadrantTop]);
const points: QuadrantPointType[] = this.data.points.map((point) => { const points: QuadrantPointType[] = this.data.points.map((point) => {
const classStyles = this.classes[point.className as keyof typeof this.classes]; const classStyles = this.classes.get(point.className!);
if (classStyles) { if (classStyles) {
point = { ...classStyles, ...point }; point = { ...classStyles, ...point };
} }