Knut Sveidqvist
686ee1e349
Relase 8.6.0
2020-07-13 16:39:52 +02:00
Knut Sveidqvist
dc2f9c304d
Font fix for rendering tests - back to noto font
2020-07-12 15:25:01 +02:00
Knut Sveidqvist
462d5c3b12
Font fix for rendering tests
2020-07-12 14:56:27 +02:00
Knut Sveidqvist
39e90a20da
Font fix for rendering tests
2020-07-12 12:21:17 +02:00
Knut Sveidqvist
61684830bf
2020-07-12 11:15:32 +02:00
Ryan Ling
5da4ced8c1
Add `flowchart.diagramPadding` config option
...
This option lets you customise the padding around the whole flowchart.
It is equivalent to `er.diagramPadding` and defaults to 8px for
backwards compatibility with the current hardcoded value.
2020-07-11 16:54:00 +10:00
Knut Sveidqvist
32b2ee8cab
2020-07-04 11:13:54 +02:00
chris moran
217bd1f4bf
Fixed test cases for sequence diagrams
...
Updated config to match a conversation knut and i had about the relationship between global, site, and integrator configuration
(Will update docs)
Renamed wrapEnabled to wrap
Poor man's caching for calculateTextDimensions, wrapLabel, and breakString (actually makes a huge difference)
2020-06-26 09:26:56 -04:00
Ashish Jain
b190a0eaba
Added support for classDiagram relation arrow markers
2020-06-24 21:45:19 +02:00
Ashish Jain
85d4f2843e
Initial commit for classDiagram v2
2020-06-24 19:34:12 +02:00
chris moran
7d9bf83f66
addition: added bounds models for bounds checking in unit tests.
...
addition: bounds.init will clear models
addition: added loop model widths id instead of using title as the id
removed parseMessage debug message
addition: added configuration labelBoxWidth and labelBoxHeight for loop label box width/height
change: adjusted svgDraw drawText to support anchor and valign and whether to output a tspan
change: drawText returns an array regardless of array size
change: hardcoded label width/height uses conf.labelBoxWidth and conf.labelBoxHeight
change: Math.round() on many of the calculations to clean up bounds values
change: getTextObj anchor, width, height start as undefined
2020-06-22 16:59:07 -04:00
Chris Moran
18254392ab
Merge branch 'mermaid-js-develop' into develop
2020-06-19 13:32:23 -04:00
Knut Sveidqvist
b3f9bbe50f
Merge branch 'develop' into 1474_missplaced_transitions
2020-06-19 11:38:30 +02:00
Knut Sveidqvist
e37c7e58cf
Merge pull request #1479 from chewnoill/chewy/cleanup-after-failed-render
...
cleanup helper dom elements before rendering
2020-06-19 11:29:46 +02:00
Knut Sveidqvist
feb9ffadec
Diagram showing sequence diagram with cut long message text
2020-06-19 11:03:37 +02:00
Knut Sveidqvist
a4d96b032e
Diagram showing sequence diagram with long message text
2020-06-19 11:01:54 +02:00
Knut Sveidqvist
038d70a40b
Diagram showing sequence diagram with long message text
2020-06-19 10:57:16 +02:00
Knut Sveidqvist
44d5009538
Revert of PR #1482
2020-06-19 10:52:20 +02:00
Chris Moran
e64a65c41e
Refactored rendering sequence diagrams
...
Fixed default config clobbering issues
Updated/corrected sequenceDiagram.spec to set the config using mermaidAPI
Enabled freeze on mermaidAPI to protect defaultConfig
2020-06-18 08:10:50 -04:00
Chris Moran
67c2fe8005
Refactored rendering sequence diagrams
...
Fixed default config clobbering issues
2020-06-17 18:13:37 -04:00
will cohen
d3d15b79fb
cleanup helper dom elements before rendering
2020-06-17 17:54:01 -04:00
Knut Sveidqvist
c95257f32c
#1474 Adding some tests
2020-06-17 18:28:49 +02:00
Knut Sveidqvist
f0162557c5
#1474 Handling transitions
2020-06-17 18:16:24 +02:00
Chris Moran
5f257119d6
Merge branch 'develop' into refactor-sequences
...
# Conflicts:
# dist/mermaid.core.js
# dist/mermaid.core.js.map
# dist/mermaid.js
# dist/mermaid.js.map
# dist/mermaid.min.js
# dist/mermaid.min.js.map
# src/config.js
# src/mermaidAPI.js
2020-06-17 06:12:02 -04:00
Chris Moran
3c72d28511
Refactored rendering sequence diagrams
2020-06-17 05:54:24 -04:00
Knut Sveidqvist
a251029546
#§473 Font update for e2e tests
2020-06-15 22:42:33 +02:00
Knut Sveidqvist
b5d457daa9
Testcommit
2020-06-15 22:26:11 +02:00
Knut Sveidqvist
603f2a2154
1473 Using setConfig instead of initialize from mermaid in some cases
2020-06-15 21:55:20 +02:00
Knut Sveidqvist
bd0210cdce
1473 Updated config handling
2020-06-15 01:11:56 +02:00
Knut Sveidqvist
5677523800
1473 Setting default config
2020-06-14 23:37:08 +02:00
Knut Sveidqvist
2150933368
Setting default config
2020-06-14 22:50:45 +02:00
Knut Sveidqvist
6559cfd0e1
#1466 Handling line styles using the new rendering engine
2020-06-13 13:12:33 +02:00
Justin Greywolf
0495103635
Fix regex and Fix incorrect test
2020-06-08 19:21:33 -07:00
Knut Sveidqvist
85a8feec9d
Also fix for error handling when setting mermaid.parseError
2020-06-06 12:42:35 +02:00
Knut Sveidqvist
b76e833ea5
#1436 Correcting intersection calculations for circles
2020-05-30 18:04:46 +02:00
Knut Sveidqvist
3bdb9f289f
Merge branch 'master' into develop
2020-05-30 17:11:23 +02:00
Knut Sveidqvist
8958b2aa1b
Merge pull request #1432 from mermaid-js/1418_html_labels_rendering_engine
...
1418 html labels rendering engine
2020-05-27 22:34:26 +02:00
Knut Sveidqvist
8603cf89b0
#1418 Fix for descriptions in states
2020-05-27 22:18:59 +02:00
Knut Sveidqvist
4ea6c98f43
#1418 Adding support for htmlLabels in stateDiagram (v2)
2020-05-27 20:41:59 +02:00
Knut Sveidqvist
39bdf261c6
2020-05-27 19:38:30 +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
9da027cf74
Fix for intersect issues for start/end state
2020-05-17 09:34:56 +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
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
67aed51742
#1382 Fix for lost parentage for nodes in deep structure
2020-05-01 19:18:07 +02:00
Russell Geraghty
950af2e753
Tidy up documentation, correct rendering in test
2020-04-28 08:28:16 +01:00
Knut Sveidqvist
fa612b731c
Renaming some tests to diffrentiate the old implementation from the impl via the new rendering engine
2020-04-26 17:48:07 +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
507582f40b
#1295 Bugfix for descriptions
2020-04-26 16:01:17 +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
25ea221a6a
#1295 Rendering tests for stateDiagram v2
2020-04-25 14:11:05 +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
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
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
Knut Sveidqvist
8455db6fae
#1295 Moving graph operations into mermaid-graplib and adding tests
2020-04-10 07:27:04 +02:00
Marc Faber
7f67435cb9
#1343 Add flowchart subroutine node shape
2020-04-10 00:14:41 +02:00
Marc Faber
dcfa903176
#1290 Hide/style today marker in gantt diagram
2020-04-05 01:59:18 +02:00
Marc Faber
fc70a8e145
#1271 Fix autonumber positioning in sequence diagrams with multiline texts
2020-04-04 21:53:31 +02:00
Russell Geraghty
e4a2d7dfb7
Updated API
2020-04-04 17:50:02 +01:00
Russell Geraghty
f081527731
User journey handler
2020-04-04 16:38:30 +01:00
Knut Sveidqvist
cff68fc062
#1295 Better way of finding suitable child in cluster to point to
2020-04-02 19:48:28 +02:00
Knut Sveidqvist
365c741864
#1295 Fix for intersection calculation for edges to clusters and adding concurrency in stateDiagrams as clusters
2020-04-02 19:35:12 +02:00
Adrian Hall
9d5303c59d
Prevent un-labelled edges that are left of the left-most vertex from being cut off the diagram
2020-04-02 15:29:12 +01:00
Knut Sveidqvist
933cc333cc
#1295 Backwards compatability
2020-03-30 22:08:48 +02:00
Knut Sveidqvist
a5af248715
Merge branch 'develop' into feature/1295_generic_rendering_engine
2020-03-30 19:15:17 +02:00
Knut Sveidqvist
240077ffe8
#1295 Adding note support to state diagrams
2020-03-29 14:20:49 +02:00
Adrian Hall
9199546dca
Alter ERD syntax for compatibility with PlantUML
2020-03-29 08:42:20 +01:00
Knut Sveidqvist
5fbb69e7c5
#1295 Styling of composite states
2020-03-28 17:34:23 +01:00
Knut Sveidqvist
85f47e1693
#1295 Styling of start/end nodes, arrows and regular states
2020-03-28 13:59:41 +01:00
Knut Sveidqvist
159a3a3706
#1295 Start shape and handling of setting a unique start id per cluster level
2020-03-25 20:16:27 +01:00
Knut Sveidqvist
5b302ae2e6
#1295 Applying new rendering engine for stateDiagrams
2020-03-22 21:45:14 +01:00
Knut Sveidqvist
02b19fed27
Merge branch 'develop' into feature/1295_generic_rendering_engine
2020-03-22 14:44:43 +01:00
Knut Sveidqvist
17f06564a2
#1295 Added the flowchart shapes
2020-03-18 22:08:19 +01:00
Adrian Hall
d3f78299e7
Add integration tests, basic docs, and fix multi-diagram bug
2020-03-18 16:53:26 +00:00
Knut Sveidqvist
215e930da4
#1295 Markers implmented, the gereric pattern and diagram specific for flowcharts.
2020-03-16 07:55:02 +01:00
Knut Sveidqvist
5b74d75011
#1295 Arrow head start
2020-03-14 18:13:34 +01:00
Knut Sveidqvist
963a0ce6ef
#1295 Edges between subgraphs
2020-03-14 17:38:35 +01:00
Knut Sveidqvist
ad288be2ee
1295 Lint fixes
2020-03-14 08:24:45 +01:00
Knut Sveidqvist
da048cbc7b
1295 Handling labels of clusters
2020-03-11 20:25:55 +01:00
Knut Sveidqvist
7bd5529bb7
1295 Support for subgraphs with wide labels
2020-03-11 19:52:57 +01:00
Knut Sveidqvist
1b64af143e
#1295 Drawing edges between nodes
2020-03-11 17:36:30 +01:00
Knut Sveidqvist
aa32d454c9
#1295 First draft of generic renderer applied to flowcharts.
2020-03-08 09:49:41 +01:00
Knut Sveidqvist
25e2d78311
#1295 Start renderer
2020-03-04 20:35:59 +01:00
Knut Sveidqvist
0ee9c69ddf
#1269 Work around for inaccurate bounding box results in Safari. Fix for multiple lines
2020-02-26 20:53:08 +01:00
Knut Sveidqvist
dd5e6c18d5
#1269 Work around for inaccurate bounding box results in Safari.
2020-02-26 20:01:53 +01:00
Marc Faber
d67e49400f
#684 Fix applying default class to flowchart nodes
2020-02-24 01:31:39 +01:00
Knut Sveidqvist
50c71ebb01
#1261 Removal of emojis making rendering tests give false warnings from time to time
2020-02-21 10:08:52 +01:00
Knut Sveidqvist
aad080aa1b
Merge pull request #1259 from mermaid-js/bug/1257_autonumbering
...
#1257 Adding the autonumber keyword + tests and docs
2020-02-16 17:13:59 +01:00
Knut Sveidqvist
3dd0c537ee
Font update for e2e tests
2020-02-16 15:39:52 +01:00
Knut Sveidqvist
f8137ea7c1
#1257 Adding the autonumber keyword + tests and docs
2020-02-16 15:26:08 +01:00
Knut Sveidqvist
f298c154e2
Merge branch 'develop' of github.com:mermaid-js/mermaid into develop
2020-02-05 19:40:18 +01:00
Knut Sveidqvist
822df37f8c
#1224 Possibility to style text color of nodes and subgraphs as well as apply classes to subgraphs
2020-02-05 19:39:50 +01:00
Marc Faber
a0e7789d50
#962 added color setting for default link style
2020-02-04 22:07:10 +01:00
Marc Faber
c95adfaf74
#962 Set text color for flowchart link labels according to linkStyle definitions
2020-02-02 22:59:59 +01:00
Knut Sveidqvist
963a0fcd77
Merge branch 'develop' into 1179-SupportGenericTypesForMembers
2020-01-29 21:08:31 +01:00
Knut Sveidqvist
c43f791b29
#1223 Removing/updating some logging, adding current.html to .gitignore
2020-01-29 20:44:15 +01:00
Knut Sveidqvist
ec90537181
#1223 Adding support for multiple transitions to a node from another node
2020-01-29 20:01:21 +01:00
Knut Sveidqvist
4709195a1d
#1223 Adding support for multiple transitions to a node from another node
2020-01-29 19:57:59 +01:00
Knut Sveidqvist
5ea6bd5980
Merge branch 'develop' into bug/1218_fix_link_click_events
2020-01-27 20:06:00 +01:00
Knut Sveidqvist
ea29b67c5c
Merge pull request #1221 from mermaid-js/bug/1216_dodging_huge_diagrams
...
#1216 Fix for issue when mermaid freezes the browser tab due to large…
2020-01-27 20:01:54 +01:00
Marc Faber
c7b46f4fba
#1218 Fix anchor and script support in link click events
2020-01-26 16:56:42 +01:00
Knut Sveidqvist
4ad354a561
#1216 Fix for issue when mermaid freezes the browser tab due to large diagrams
2020-01-25 13:35:11 +01:00
Justin Greywolf
587592449a
1179 Add ability to use generics for members
...
Created new class to handle parsing of members with regex to handle determining type of member and the different elements within. Also moved addTSpan in drawClass method to this new file. Finally, I added a "catch all" section in case something fails in the regex to make sure everything gets formatted correctly.
Added more tests and documentation
updating gitignore
Tired of constantly having to ignore files and stash/pop when switching between branches
2020-01-24 16:01:04 -08:00
Marc Faber
d2d4a24229
#487 Set text color for flowchart nodes according to style definitions
2020-01-24 01:24:47 +01:00
Marc Faber
c38f053294
#1212 Class definition is not applied to flowchart nodes with links
2020-01-19 18:10:14 +01:00
Knut Sveidqvist
45277affe8
Merge pull request #1204 from GDFaber/bug/1196_keep_flowchart_label_text_when_style_is_applied
...
Keep flowchart node label text (if already defined) when a style is applied
2020-01-15 18:27:48 +01:00
Marc Faber
b1bfdec473
#1196 Keep flowchart node label text (if already defined) when a style is applied
2020-01-14 23:37:30 +01:00
Marc Faber
5493fadc9e
#1200 Unify regex for finding <br> tags throughout mermaid
2020-01-13 22:04:47 +01:00
Justin Greywolf
58fbfc3c38
1119 Support method return types
...
Small refactor to split out logic for determining method display text and style. Updated documentation
Used regex to parse method statements in class diagrams to extract discrete elements to set display appropriately. Added tests and updated docs
2020-01-10 09:50:21 -08:00
Knut Sveidqvist
144f65c459
Merge pull request #1176 from GDFaber/feature/1152_flowchart_node_spacing
...
Feature/Add node spacing to flowchart configuration
2020-01-08 18:16:03 +01:00
Marc Faber
1cfd93640c
#743 handle multiline section titles in gantt diagrams
2020-01-08 13:50:58 +01:00
Marc Faber
b3934c9788
#1152 add node spacing to flowchart configuration
2020-01-05 22:03:53 +01:00
Knut Sveidqvist
f57356006d
Merge pull request #1171 from mermaid-js/feature/Issue-1146_Dashed_Line_For_Class_Diagram
...
Feature/issue 1146 dashed line for class diagram
2020-01-05 12:02:36 +01:00
Ashish Jain
96fc0d043e
#1146 Added cypress test for dash line (dependecy) rendering
2020-01-02 19:57:11 +01:00
Knut Sveidqvist
4e6aad5115
#834 Using & as a separator for the multiple nodes
2020-01-02 18:52:50 +01:00
Knut Sveidqvist
7bd1408de0
Merge pull request #1165 from jgreywolf/1064-ClickEventInClassDiagram
...
1064 click event in class diagram
2020-01-02 08:10:48 -08:00
Knut Sveidqvist
33916cfbd3
Adding interaction tests for gantt callbacks with arguments
2020-01-01 12:03:29 -08:00
Knut Sveidqvist
75e2abe242
Merge pull request #1166 from GDFaber/feature/flowchart_add_cylindric_shape
...
#1154 Flow diagram DB shape request
2020-01-01 00:24:56 -08:00
Knut Sveidqvist
413876644c
Merge pull request #1162 from sdankel/bug/1060_date_infinite_loop
...
Fix infinite loop caused by date iteration
2019-12-31 07:57:16 -08:00
Marc Faber
bc59d015e6
#1154 Flow diagram DB shape request
2019-12-31 16:30:03 +01:00
Justin Greywolf
2decf94ad0
1064- Add click functionality to class diagrams
...
modified interaction functionality from flowcharts to work with class diagrams
2019-12-30 17:27:20 -08:00
Sophie Dankel
7b12c7a07d
Fix infinite loop caused by date iteration
2019-12-24 19:01:29 -08:00
Gene Wood
b4f9dd46a9
Add tests for <br \t> case
...
This adds tests for the case where
* multiple pieces of whitespace are used
* one of those whitespace characters is a tab
2019-12-23 08:52:15 -08:00
Marc Faber
233520b797
#702 improve handling of different "br" tag notations for multiline texts in sequence diagrams
2019-12-21 20:39:32 +01:00
Knut Sveidqvist
a4e7305d52
#834 Adding unit tests and rendering tests
2019-12-18 19:13:56 +01:00
Knut Sveidqvist
4ff4058244
#1142 Simplified arrows/edges in the grammar
2019-12-15 13:34:35 +01:00
Knut Sveidqvist
fcf20215a6
#552 Adding rendering test
2019-12-11 21:12:48 +01:00
Knut Sveidqvist
1811318dea
#1088 Adding rendering tests
2019-12-11 20:17:51 +01:00
Justin Greywolf
363d49b655
Renumber render tests
2019-12-11 10:34:51 -08:00
Justin Greywolf
de8c6d5572
Merge branch 'develop' into 1104(b)-SupportForAbstractMethodInClassDiagram
2019-12-11 10:31:27 -08:00
Knut Sveidqvist
5b4e95484e
Merge pull request #1120 from jgreywolf/1063-GenericTypeSupportInClassDiagrams
...
Class: Generic type support
2019-12-11 19:09:19 +01:00
Justin Greywolf
5b2f9351c7
Add support for abstract methods
...
Added logic to allow rendering of a method name with italics or underline based on modifier at beginning of name to set css style
2019-12-09 18:13:06 -08:00
Justin Greywolf
6fdf30357c
1104-Add support to designate a method as abstract
...
Added logic to allow rendering of a method name with italics or underline based on modifier at beginning of name to set css style
2019-12-09 17:41:26 -08:00
Knut Sveidqvist
d23ce9fb63
#935 Fix for stylink of links. Default theme colors are picked up and styling via themeCSS works
2019-12-08 10:10:03 +01:00
Knut Sveidqvist
ab191abd5a
#903 Fix for broken build
2019-12-07 15:06:44 +01:00
Knut Sveidqvist
c2e5e94b37
#903 Allowing >,< and = characters in svg. Updating xss tests to handle both htmlLabels and non htmlLabels
2019-12-07 12:19:45 +01:00
Justin Greywolf
2a41280076
Add support for Generic class definitions
...
Added support in parser to translate characters surrounded by `~` into generic type definition ie: `Class01~T~` would turn into `Class01<T>`
2019-12-05 12:59:22 -08:00
Knut Sveidqvist
5c71a3c85b
#1110 Fix for transparent rect under edge title, was misaligned
2019-12-04 18:20:28 +01:00
Knut Sveidqvist
94e768dd01
#1110 Cleanup and removal of loggings
2019-12-04 18:04:56 +01:00