Knut Sveidqvist
39bdf261c6
2020-05-27 19:38:30 +02:00
Knut Sveidqvist
7a7e8fe741
Merge pull request #1425 from spopida/bug/1415_erd_empty_label_not_working
...
Ensure empty quoted relationship labels are accepted in ER diagrams
2020-05-27 19:30:21 +02:00
Adrian Hall
f1c05bc909
Ensure empty quoted relationship labels are accepted in ER diagrams
2020-05-23 13:33:44 +01:00
Knut Sveidqvist
ef24020b14
Merge pull request #1411 from ivan-danilov/sequence-over-notes-position-fix
...
Fixed SequenceDiagram over note horizontal position
2020-05-22 09:33:54 +02:00
Knut Sveidqvist
9da027cf74
Fix for intersect issues for start/end state
2020-05-17 09:34:56 +02:00
Knut Sveidqvist
45e9988700
Lint fix
2020-05-16 21:59:13 +02:00
Knut Sveidqvist
c21b61bbd2
Bug fixes in new functionality, intersections not taken into account in nodes used by new graph engine. Graph flowchart not usable when integrating using mermaid.core. Incorrect flwochart docs
2020-05-16 19:58:22 +02:00
Ivan Danilov
61249b0887
Fixed SequenceDiagram over note horizontal position
...
Previous expression with noteWidth does not make sense as noteWidth is
not used in case of note over two participants - forceWidth is used
instead. It tried to be symmetrical over cases A,B and B,A but failed.
Can be seen with messages over conf.width size (cannot reproduce in the
live editor as it seems to use not the last version where the code
does not use noteWidth).
The changed code explicitly calculates which of the actors is the
"left" one and starts rendering half margin to the left of its cetral
line.
2020-05-13 21:50:25 -07:00
Knut Sveidqvist
7b15fefcaa
#1408 Mocking new module in tests
2020-05-13 19:21:53 +02:00
Knut Sveidqvist
6d076284e8
#1408 Removing crypto-random-string and he
2020-05-13 19:14:18 +02:00
Knut Sveidqvist
d7d248fd04
Merge pull request #1388 from mermaid-js/1386_finetuning_rendering_engine
...
1386 finetuning rendering engine
2020-05-13 17:36:12 +02:00
Knut Sveidqvist
1fc6603f41
Merge branch 'develop' into feature/remove-lodash
2020-05-13 17:34:26 +02:00
Adrian Hall
053a86c0d4
Do explicit imports for d3 instead of wildcards
2020-05-11 07:10:04 +01:00
hikerpig
28ea68fe7f
Replace lodash with specific implementations, #1389
2020-05-07 21:35:34 +08:00
Knut Sveidqvist
9a3ec31191
#1386 Adding support for click events and links
2020-05-06 18:51:12 +02:00
Knut Sveidqvist
a20e6086cc
#1386 Adding subroutine support for new rendering engine
2020-05-03 21:52:44 +02:00
Knut Sveidqvist
a8f9e3f0b0
#1386 Adding some docs and adjusted sizing for state diagrams
2020-05-03 13:31:09 +02:00
Knut Sveidqvist
67aed51742
#1382 Fix for lost parentage for nodes in deep structure
2020-05-01 19:18:07 +02:00
Adrian Hall
d068a460bd
Change ERD fontSize config to an integer to prevent NaN errors
2020-04-30 15:55:14 +01:00
Knut Sveidqvist
0933268e61
Merge pull request #1371 from jgreywolf/1234-RefactorClassDiagramScaling
...
1234 refactor class diagram scaling
2020-04-26 17:23:14 +02:00
Knut Sveidqvist
3aa5fc0cc2
Merge pull request #1365 from dany74q/feature/sequence-diagrams-improvements
...
Feature/sequence diagrams improvements
2020-04-26 17:21:55 +02:00
Knut Sveidqvist
397f57accb
Merge pull request #1334 from russellgeraghty/feature/user-journey
...
Feature/user journey
2020-04-26 17:17:33 +02:00
Knut Sveidqvist
e3b1944e31
Merge pull request #1370 from mermaid-js/feature/1295_generic_rendering_engine
...
Feature/1295 generic rendering engine
2020-04-26 16:55:11 +02:00
Knut Sveidqvist
507582f40b
#1295 Bugfix for descriptions
2020-04-26 16:01:17 +02:00
Justin Greywolf
08e015a951
1234-RefactorDiagramScaling
...
Changed implementation to ensure that viewport is aligned correctly, rather than increasing size
2020-04-26 06:10:18 -07:00
Justin Greywolf
ef17f4eacb
1274-adjust diagram viewbox
2020-04-26 05:51:03 -07:00
Knut Sveidqvist
76b4b88e4b
#1295 Alternating graph directions for subgraphs
2020-04-26 12:57:45 +02:00
Knut Sveidqvist
fd37edc53f
#1295 Adding support for forks and joins
2020-04-26 10:07:25 +02:00
Knut Sveidqvist
5662c06a33
#1295 Adding support for multiline descriptions for states
2020-04-26 09:47:47 +02:00
Knut Sveidqvist
0aede618ec
#1295 Adding support for multiline descriptions for states
2020-04-25 17:01:20 +02:00
Knut Sveidqvist
e52d4ce033
#1295 Removing invalid title for concurrency clusters
2020-04-25 14:18:23 +02:00
Knut Sveidqvist
b646672d3e
#1295 Fix for statediagram labels
2020-04-25 14:12:35 +02:00
Knut Sveidqvist
a1a7d44fd7
#1295 for Multi line labels separated with \n
2020-04-25 14:12:04 +02:00
Danny Shemesh
862f20ef20
Added cypress e2e tests for suggested improvements
...
This commits adds e2e tests for the suggested improvements.
I've went over the generated screenshots and they look good to me.
2020-04-23 18:31:22 +03:00
Danny Shemesh
5c902001b9
Merge branch 'develop' of github.com:mermaid-js/mermaid into develop
2020-04-23 17:08:25 +03:00
Danny Shemesh
5f6887b316
Sequence diagram fixes & improvements
...
This commit fixes some bugs, and I believe, improves upon the current
implementation.
In no particular order, it adds:
1. Control over note font size, family and alignment (now defaults to
center)
2. Dynamic actor resizing - actor's width will now scale if its
description is bigger than the static configured width
3. Dynamic actor margins - the margin between actors will now be
dynamically calculated by taking into account the width of connecting
messages or notes
4. Fixed a small visual annoyance where a loop arrow would intersect
with the text it loops on
5. Fixed a bug where if global config -> fontFamily wasn't defined, it
would override the actorFontFamily with an undefined
6. Removed some stale / commented out code
7. Added missing config variables to the global config object in mermaidAPI.js
8. Added messageFontSize, messageFontFamily to control message (non-note)
font settings
9. Memoized the actor widths in a pre-calculation that takes notes and
signals lengths into account
10. Removed redundant console.log lines
11. Extracted out actor width & margin calculation to getMaxMessageWidthPerActor, and
calculateActorMargins
2020-04-23 16:50:00 +03:00
Danny Shemesh
197d006860
Extracted out the commonly used line break regex
...
This commit extract the commonly used /br\s*\/?>/gi regex to common.js,
in order to keep the code more DRY.
2020-04-23 07:55:28 +03:00
Danny Shemesh
49f8aac6a9
Fixed outdated doc strings
...
This commit fixes some outdated docstrings, replacing the description
and @params where necessary.
2020-04-23 07:55:09 +03:00
Danny Shemesh
22dd50a047
Extracted out the commonly used line break regex
...
This commit extract the commonly used /br\s*\/?>/gi regex to common.js,
in order to keep the code more DRY.
2020-04-23 07:20:47 +03:00
Knut Sveidqvist
81d9b5afd6
#1295 Linting
2020-04-22 20:05:36 +02:00
Knut Sveidqvist
59f3d2a11e
#1295 Fix for edges in subgraphs and handling of concurrent states in statediagram-v2
2020-04-22 20:03:41 +02:00
Russell Geraghty
249a14f84a
Merge remote-tracking branch 'upstream/develop' into feature/user-journey
2020-04-17 07:30:53 +01:00
Knut Sveidqvist
e8e7b419b5
#1295 Lint fixes
2020-04-16 19:57:56 +02:00
Knut Sveidqvist
c3f2e8dde1
#1295 Render fix for flowchart, correct marker handling and some cleanup
2020-04-16 19:44:11 +02:00
Russell Geraghty
433f88b459
Merge remote-tracking branch 'upstream/develop' into feature/user-journey
2020-04-13 20:08:20 +01:00
Knut Sveidqvist
704d56d193
#1295 Updates mermaid-graphlib
2020-04-13 16:25:10 +02:00
Knut Sveidqvist
5f4da6e0bc
Merge branch 'develop' into feature/1295_generic_rendering_engine
2020-04-11 18:53:47 +02:00
Knut Sveidqvist
22e17172dd
#1295 Recursive rendering, draft
2020-04-11 17:16:01 +02:00
Knut Sveidqvist
6ec731e263
Merge pull request #1345 from GDFaber/feature/1343_add_flowchart_subroutine_shape
...
Add flowchart subroutine node shape
2020-04-11 14:12:20 +02:00
Knut Sveidqvist
7cd8b6f938
Merge pull request #1336 from GDFaber/feature/1290_hide_or_style_gantt_today_marker
...
#1290 Hide/style today marker in gantt diagram
2020-04-11 14:04:31 +02:00
