GitHub/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-01-14 06:43:25 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into sidv/fixRunAsync

Browse Source 
* develop:
  Update docs
  fix: fix exports
  Doc (typo): remove duplicate "be"
  💄 section width now covers all tasks
This commit is contained in:
Sidharth Vinod 2023-02-24 20:54:55 +05:30
commit 1bace23cea
No known key found for this signature in database
GPG Key ID: FB5CCD378D3907CD
5 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/syntax/sequenceDiagram.md
View File

@ -595,7 +595,7 @@ It is possible to get a sequence number attached to each arrow in a sequence dia
</script>
```
It can also be be turned on via the diagram code as in the diagram:
It can also be turned on via the diagram code as in the diagram:
```mermaid-example
sequenceDiagram

4
packages/mermaid/package.json
View File

@ -7,8 +7,8 @@
"types": "./dist/mermaid.d.ts",
"exports": {
".": {
"import": "./dist/mermaid.core.mjs",
"types": "./dist/mermaid.d.ts"
"types": "./dist/mermaid.d.ts",
"import": "./dist/mermaid.core.mjs"
},
"./*": "./*"
},

12
packages/mermaid/src/diagrams/user-journey/journeyRenderer.ts
View File

@ -224,6 +224,17 @@ export const drawTasks = function (diagram, tasks, verticalPos) {
num = sectionNumber % fills.length;
colour = textColours[sectionNumber % textColours.length];
// count how many consecutive tasks have the same section
let taskInSectionCount = 0;
const currentSection = task.section;
for (let taskIndex = i; taskIndex < tasks.length; taskIndex++) {
if (tasks[taskIndex].section == currentSection) {
taskInSectionCount = taskInSectionCount + 1;
} else {
break;
}
}
const section = {
x: i * conf.taskMargin + i * conf.width + LEFT_MARGIN,
y: 50,
@ -231,6 +242,7 @@ export const drawTasks = function (diagram, tasks, verticalPos) {
fill,
num,
colour,
taskCount: taskInSectionCount,
};
svgDraw.drawSection(diagram, section, conf);

5
packages/mermaid/src/diagrams/user-journey/svgDraw.js
View File

@ -196,7 +196,10 @@ export const drawSection = function (elem, section, conf) {
rect.x = section.x;
rect.y = section.y;
rect.fill = section.fill;
rect.width = conf.width;
// section width covers all nested tasks
rect.width =
conf.width * section.taskCount + // width of the tasks
conf.diagramMarginX * (section.taskCount - 1); // width of space between tasks
rect.height = conf.height;
rect.class = 'journey-section section-type-' + section.num;
rect.rx = 3;

2
packages/mermaid/src/docs/syntax/sequenceDiagram.md
View File

@ -418,7 +418,7 @@ It is possible to get a sequence number attached to each arrow in a sequence dia
</script>
```
It can also be be turned on via the diagram code as in the diagram:
It can also be turned on via the diagram code as in the diagram:
```mermaid-example
sequenceDiagram