Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bug: State diagram fix classes type #3798

Merged
merged 10 commits into from
Nov 17, 2022
Merged

bug: State diagram fix classes type #3798

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ccd55a0
add stateDiagram-v2 to list of graphs with classDefs
weedySeaDragon Nov 14, 2022
345eaad
stateDB classes must be a {} not []
weedySeaDragon Nov 14, 2022
9996e53
(minor) add comments, remove duplicated line
weedySeaDragon Nov 15, 2022
d3f5474
(minor) fix JSdoc types in comments
weedySeaDragon Nov 15, 2022
c6db052
+ spec stateRenderer-v2.js getClasses() to verify it returns a {}
weedySeaDragon Nov 15, 2022
1ecd4a5
(minor) fix JSdoc tag
weedySeaDragon Nov 15, 2022
6090a1f
(minor) import expectTypeOf in spec
weedySeaDragon Nov 15, 2022
13f3008
diagramClasses no longer needs to be cached; mermaidAPI no longer cal…
weedySeaDragon Nov 15, 2022
fcec9ad
diagramStates should not be global; pass it into functions; minor com…
weedySeaDragon Nov 15, 2022
2cbf611
create separate spec for stateRenderer-v2
weedySeaDragon Nov 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions packages/mermaid/src/diagrams/state/stateDb.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,15 @@ const FILL_KEYWORD = 'fill';
const BG_FILL = 'bgFill';
const STYLECLASS_SEP = ',';

// Returns a new list of classes.
// In the future, this can be replaced with a class common to all diagrams.
function newClassesList() {
return {};
}

let direction = DEFAULT_DIAGRAM_DIRECTION;
let rootDoc = [];
let classes = []; // style classes defined by a classDef
let classes = newClassesList(); // style classes defined by a classDef

const newDoc = () => {
return {
Expand Down Expand Up @@ -274,7 +280,7 @@ export const clear = function (saveCommon) {

// number of start and end nodes; used to construct ids
startEndCount = 0;
classes = [];
classes = newClassesList();
if (!saveCommon) {
commonClear();
}
Expand Down
2 changes: 1 addition & 1 deletion packages/mermaid/src/mermaidAPI.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import { evaluate } from './diagrams/common/common';
import { isEmpty } from 'lodash';

// diagram names that support classDef statements
const CLASSDEF_DIAGRAMS = ['graph', 'flowchart', 'flowchart-v2', 'stateDiagram'];
const CLASSDEF_DIAGRAMS = ['graph', 'flowchart', 'flowchart-v2', 'stateDiagram', 'stateDiagram-v2'];

const MAX_TEXTLENGTH_EXCEEDED_MSG =
'graph TB;a[Maximum text size in diagram exceeded];style a fill:#faa';
Expand Down