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

Jump to bottom

fix not rendered style when style is optional #4528

Merged
merged 7 commits into from
Jun 27, 2023
Merged

fix not rendered style when style is optional #4528

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
07f6358
fix not rendered style when style is optional
Yokozuna59 Jun 24, 2023
f2c4027
change `diagramTheme` and `themes` to return `string`
Yokozuna59 Jun 26, 2023
c439424
Merge branch 'mermaid-js:develop' into bug/4527_fix-optional-style-issue
Yokozuna59 Jun 26, 2023
f020f4a
remove `diagramTheme` arrow function return
Yokozuna59 Jun 26, 2023
3106ddb
add `getDiagramStyles` type and use it in `style.ts`
Yokozuna59 Jun 26, 2023
8b67200
change `options` paramter to any instead of `unknown`
Yokozuna59 Jun 26, 2023
64a28be
rename `getDiagramStyles` type into `DiagramStylesProvider`
Yokozuna59 Jun 26, 2023
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
5 changes: 1 addition & 4 deletions packages/mermaid/src/diagram-api/diagramAPI.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import { addStylesForDiagram } from '../styles.js';
import { DiagramDefinition, DiagramDetector } from './types.js';
import * as _commonDb from '../commonDb.js';
import { parseDirective as _parseDirective } from '../directiveUtils.js';
import isEmpty from 'lodash-es/isEmpty.js';

/*
Packaging and exposing resources for external diagrams so that they can import
Expand Down Expand Up @@ -51,9 +50,7 @@ export const registerDiagram = (
if (detector) {
addDetector(id, detector);
}
if (!isEmpty(diagram.styles)) {
addStylesForDiagram(id, diagram.styles);
}
addStylesForDiagram(id, diagram.styles);

if (diagram.injectUtils) {
diagram.injectUtils(
Expand Down
11 changes: 8 additions & 3 deletions packages/mermaid/src/styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { FlowChartStyleOptions } from './diagrams/flowchart/styles.js';
import { log } from './logger.js';

const themes: Record<string, any> = {};
const themes: Record<string, (options?: any) => string> = {};
Yokozuna59 marked this conversation as resolved.
Show resolved Hide resolved

const getStyles = (
type: string,
Expand Down Expand Up @@ -73,8 +73,13 @@ const getStyles = (
`;
};

export const addStylesForDiagram = (type: string, diagramTheme: unknown): void => {
themes[type] = diagramTheme;
export const addStylesForDiagram = (
type: string,
diagramTheme?: (options?: any) => string
Yokozuna59 marked this conversation as resolved.
Show resolved Hide resolved
): void => {
if (diagramTheme !== undefined) {
themes[type] = diagramTheme;
}
};

export default getStyles;