marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-12-09 22:14:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

MC-1278 Making adding data-et and data-id to life-lines and actors

Browse Source
This commit is contained in:
Knut Sveidqvist
2024-02-16 12:10:12 +01:00
parent f1e5bd37ae
commit 762daac854
7 changed files with 78 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/mermaid/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "mermaid",
"version": "10.8.0",
"name": "@mermaid-chart/mermaid",
"version": "10.8.0-b.2",
"description": "Markdown-ish syntax for generating flowcharts, sequence diagrams, class diagrams, gantt charts and git graphs.",
"type": "module",
"module": "./dist/mermaid.core.mjs",

9
packages/mermaid/src/diagrams/sequence/sequenceRenderer.ts
View File

@@ -437,6 +437,9 @@ const drawMessage = function (diagram, msgModel, lineStartY: number, diagObj: Di
line.attr('class', 'messageLine0');
}
line.attr('data-et', 'message');
line.attr('data-id', 'i' + msgModel.id);
let url = '';
if (conf.arrowMarkerAbsolute) {
url =
@@ -835,6 +838,7 @@ export const draw = function (_text: string, id: string, _version: string, diagO
const messagesToDraw = [];
const backgrounds = [];
messages.forEach(function (msg, index) {
// console.log('msg', msg);
let loopModel, noteModel, msgModel;
switch (msg.type) {
@@ -994,6 +998,7 @@ export const draw = function (_text: string, id: string, _version: string, diagO
msgModel.starty = bounds.getVerticalPos();
msgModel.sequenceIndex = sequenceIndex;
msgModel.sequenceVisible = diagObj.db.showSequenceNumbers();
msgModel.id = msg.id;
const lineStartY = boundMessage(diagram, msgModel);
adjustCreatedDestroyedData(
msg,
@@ -1032,7 +1037,9 @@ export const draw = function (_text: string, id: string, _version: string, diagO
log.debug('destroyedActors', destroyedActors);
drawActors(diagram, actors, actorKeys, false);
messagesToDraw.forEach((e) => drawMessage(diagram, e.messageModel, e.lineStartY, diagObj));
messagesToDraw.forEach((e) => {
drawMessage(diagram, e.messageModel, e.lineStartY, diagObj);
});
if (conf.mirrorActors) {
drawActors(diagram, actors, actorKeys, true);
}

9
packages/mermaid/src/diagrams/sequence/svgDraw.js
View File

@@ -297,6 +297,8 @@ const drawActorTypeParticipant = function (elem, actor, conf, isFooter) {
}
g.append('line')
.attr('id', 'actor' + actorCnt)
.attr('data-et', 'life-line')
.attr('data-id', actor.name)
.attr('x1', center)
.attr('y1', centerY)
.attr('x2', center)
@@ -345,6 +347,9 @@ const drawActorTypeParticipant = function (elem, actor, conf, isFooter) {
}
}
g.attr('data-et', 'participant');
g.attr('data-id', actor.name);
_drawTextCandidateFunc(conf)(
actor.description,
g,
@@ -382,6 +387,8 @@ const drawActorTypeActor = function (elem, actor, conf, isFooter) {
.attr('y1', centerY)
.attr('x2', center)
.attr('y2', 2000)
.attr('data-et', 'life-line')
.attr('data-id', actor.name)
.attr('class', 'actor-line')
.attr('class', '200')
.attr('stroke-width', '0.5px')
@@ -398,6 +405,8 @@ const drawActorTypeActor = function (elem, actor, conf, isFooter) {
}
actElem.attr('class', cssClass);
actElem.attr('data-et', 'participant').attr('data-id', actor.name);
const rect = svgDrawCommon.getNoteRect();
rect.x = actor.x;
rect.y = actorY;

10
packages/mermaid/src/mermaidAPI.spec.ts
View File

@@ -689,11 +689,11 @@ describe('mermaidAPI', () => {
mermaidAPI.parse('graph TD;A--x|text including URL space|B;')
).resolves.toBeTruthy();
});
it('returns true for valid definition with silent option', async () => {
await expect(
mermaidAPI.parse('graph TD;A--x|text including URL space|B;', { suppressErrors: true })
).resolves.toBe(true);
});
// it('returns true for valid definition with silent option', async () => {
// await expect(
// mermaidAPI.parse('graph TD;A--x|text including URL space|B;', { suppressErrors: true })
// ).resolves.toBe(true);
// });
});
describe('render', () => {