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] Sequence diagram actor menu popup #5160

Merged
merged 5 commits into from
Jan 26, 2024
Merged

[Fix] Sequence diagram actor menu popup #5160

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e6bd1ae
fix sequence diagram popup
vitorsss Dec 22, 2023
46552fa
Merge branch 'develop' into fix/4212_actor_menus_sequence_diagram_popup
sidharthv96 Jan 19, 2024
d74025b
Merge branch 'develop' into fix/4212_actor_menus_sequence_diagram_popup
vitorsss Jan 19, 2024
8fd268d
add sequenceDiagram link e2e test
vitorsss Jan 19, 2024
c226358
Merge branch 'develop' into fix/4212_actor_menus_sequence_diagram_popup
vitorsss Jan 19, 2024
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
24 changes: 24 additions & 0 deletions demos/sequence.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ <h1>Sequence diagram demos</h1>
participant Alice
participant Bob
participant John as John<br />Second Line
link Alice: Dashboard @ https://dashboard.contoso.com/alice
link Alice: Wiki @ https://wiki.contoso.com/alice
link John: Dashboard @ https://dashboard.contoso.com/john
link John: Wiki @ https://wiki.contoso.com/john
autonumber 10 10
rect rgb(200, 220, 100)
rect rgb(200, 255, 200)
Expand Down Expand Up @@ -62,6 +66,26 @@ <h1>Sequence diagram demos</h1>
</pre>
<hr />
<pre class="mermaid">
---
title: With forced menus
config:
sequence:
forceMenus: true
---
sequenceDiagram
participant Alice
participant John
link Alice: Dashboard @ https://dashboard.contoso.com/alice
link Alice: Wiki @ https://wiki.contoso.com/alice
link John: Dashboard @ https://dashboard.contoso.com/john
link John: Wiki @ https://wiki.contoso.com/john
Alice->>John: Hello John, how are you?
John-->>Alice: Great!
Alice-)John: See you later!
</pre
>
<hr />
<pre class="mermaid">
sequenceDiagram
accTitle: Sequence diagram title is here
accDescr: Hello friends
Expand Down
49 changes: 5 additions & 44 deletions packages/mermaid/src/diagrams/sequence/svgDraw.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,6 @@
return svgDrawCommon.drawRect(elem, rectData);
};

const addPopupInteraction = (id, actorCnt) => {
addFunction(() => {
const arr = document.querySelectorAll(id);
// This will be the case when running in sandboxed mode
if (arr.length === 0) {
return;
}
arr[0].addEventListener('mouseover', function () {
popupMenuUpFunc('actor' + actorCnt + '_popup');
});
arr[0].addEventListener('mouseout', function () {
popupMenuDownFunc('actor' + actorCnt + '_popup');
});
});
};

export const drawPopup = function (elem, actor, minMenuWidth, textAttrs, forceMenus) {
if (actor.links === undefined || actor.links === null || Object.keys(actor.links).length === 0) {
return { height: 0, width: 0 };
Expand All @@ -44,7 +28,6 @@
g.attr('id', 'actor' + actorCnt + '_popup');
g.attr('class', 'actorPopupMenu');
g.attr('display', displayValue);
addPopupInteraction('#actor' + actorCnt + '_popup', actorCnt);
var actorClass = '';
if (rectData.class !== undefined) {
actorClass = ' ' + rectData.class;
Expand Down Expand Up @@ -90,36 +73,14 @@
return { height: rectData.height + linkY, width: menuWidth };
};

export const popupMenu = function (popid) {
const popupMenuToggle = function (popid) {
return (
"var pu = document.getElementById('" +
popid +
"'); if (pu != null) { pu.style.display = 'block'; }"
"'); if (pu != null) { pu.style.display = pu.style.display == 'block' ? 'none' : 'block'; }"
);
};

export const popdownMenu = function (popid) {
return (
"var pu = document.getElementById('" +
popid +
"'); if (pu != null) { pu.style.display = 'none'; }"
);
};

const popupMenuUpFunc = function (popupId) {
var pu = document.getElementById(popupId);
if (pu != null) {
pu.style.display = 'block';
}
};

const popupMenuDownFunc = function (popupId) {
var pu = document.getElementById(popupId);
if (pu != null) {
pu.style.display = 'none';
}
};

export const drawText = function (elem, textData) {
let prevTextHeight = 0;
let textHeight = 0;
Expand Down Expand Up @@ -329,6 +290,9 @@

if (!isFooter) {
actorCnt++;
if (Object.keys(actor.links || {}).length && !conf.forceMenus) {
g.attr('onclick', popupMenuToggle(`actor${actorCnt}_popup`)).attr('cursor', 'pointer');

Check warning on line 294 in packages/mermaid/src/diagrams/sequence/svgDraw.js

View check run for this annotation

Codecov / codecov/patch

packages/mermaid/src/diagrams/sequence/svgDraw.js#L294 

Added line #L294 was not covered by tests
}
g.append('line')
.attr('id', 'actor' + actorCnt)
.attr('x1', center)
Expand All @@ -345,7 +309,6 @@

if (actor.links != null) {
g.attr('id', 'root-' + actorCnt);
addPopupInteraction('#root-' + actorCnt, actorCnt);
}
}

Expand Down Expand Up @@ -1053,8 +1016,6 @@
insertClockIcon,
getTextObj,
getNoteRect,
popupMenu,
popdownMenu,
fixLifeLineHeights,
sanitizeUrl,
};
Loading