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
18254392ab
Merge branch 'mermaid-js-develop' into develop
2020-06-19 13:32:23 -04:00
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
44d5009538
Revert of PR #1482
2020-06-19 10:52:20 +02:00
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
67c2fe8005
Refactored rendering sequence diagrams
...
Fixed default config clobbering issues
2020-06-17 18:13:37 -04:00
d3d15b79fb
cleanup helper dom elements before rendering
2020-06-17 17:54:01 -04:00
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
3c72d28511
Refactored rendering sequence diagrams
2020-06-17 05:54:24 -04:00
b5d457daa9
Testcommit
2020-06-15 22:26:11 +02:00
603f2a2154
1473 Using setConfig instead of initialize from mermaid in some cases
2020-06-15 21:55:20 +02:00
5677523800
1473 Setting default config
2020-06-14 23:37:08 +02:00
2150933368
Setting default config
2020-06-14 22:50:45 +02:00
0495103635
Fix regex and Fix incorrect test
2020-06-08 19:21:33 -07:00
f1c05bc909
Ensure empty quoted relationship labels are accepted in ER diagrams
2020-05-23 13:33:44 +01:00
950af2e753
Tidy up documentation, correct rendering in test
2020-04-28 08:28:16 +01:00
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
3aa5fc0cc2
Merge pull request #1365 from dany74q/feature/sequence-diagrams-improvements
...
Feature/sequence diagrams improvements
2020-04-26 17:21:55 +02:00
397f57accb
Merge pull request #1334 from russellgeraghty/feature/user-journey
...
Feature/user journey
2020-04-26 17:17:33 +02:00
507582f40b
#1295 Bugfix for descriptions
2020-04-26 16:01:17 +02:00
25ea221a6a
#1295 Rendering tests for stateDiagram v2
2020-04-25 14:11:05 +02:00
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
433f88b459
Merge remote-tracking branch 'upstream/develop' into feature/user-journey
2020-04-13 20:08:20 +01:00
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
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
7f67435cb9
#1343 Add flowchart subroutine node shape
2020-04-10 00:14:41 +02:00
dcfa903176
#1290 Hide/style today marker in gantt diagram
2020-04-05 01:59:18 +02:00
fc70a8e145
#1271 Fix autonumber positioning in sequence diagrams with multiline texts
2020-04-04 21:53:31 +02:00
f081527731
User journey handler
2020-04-04 16:38:30 +01:00
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
9199546dca
Alter ERD syntax for compatibility with PlantUML
2020-03-29 08:42:20 +01:00
d3f78299e7
Add integration tests, basic docs, and fix multi-diagram bug
2020-03-18 16:53:26 +00:00
d67e49400f
#684 Fix applying default class to flowchart nodes
2020-02-24 01:31:39 +01:00
50c71ebb01
#1261 Removal of emojis making rendering tests give false warnings from time to time
2020-02-21 10:08:52 +01:00
f8137ea7c1
#1257 Adding the autonumber keyword + tests and docs
2020-02-16 15:26:08 +01:00
f298c154e2
Merge branch 'develop' of github.com:mermaid-js/mermaid into develop
2020-02-05 19:40:18 +01:00
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
a0e7789d50
#962 added color setting for default link style
2020-02-04 22:07:10 +01:00
c95adfaf74
#962 Set text color for flowchart link labels according to linkStyle definitions
2020-02-02 22:59:59 +01:00
963a0fcd77
Merge branch 'develop' into 1179-SupportGenericTypesForMembers
2020-01-29 21:08:31 +01:00
ec90537181
#1223 Adding support for multiple transitions to a node from another node
2020-01-29 20:01:21 +01:00
4709195a1d
#1223 Adding support for multiple transitions to a node from another node
2020-01-29 19:57:59 +01:00
5ea6bd5980
Merge branch 'develop' into bug/1218_fix_link_click_events
2020-01-27 20:06:00 +01:00
c7b46f4fba
#1218 Fix anchor and script support in link click events
2020-01-26 16:56:42 +01:00
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
d2d4a24229
#487 Set text color for flowchart nodes according to style definitions
2020-01-24 01:24:47 +01:00
c38f053294
#1212 Class definition is not applied to flowchart nodes with links
2020-01-19 18:10:14 +01:00
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
b1bfdec473
#1196 Keep flowchart node label text (if already defined) when a style is applied
2020-01-14 23:37:30 +01:00
5493fadc9e
#1200 Unify regex for finding <br> tags throughout mermaid
2020-01-13 22:04:47 +01:00
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
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
1cfd93640c
#743 handle multiline section titles in gantt diagrams
2020-01-08 13:50:58 +01:00
b3934c9788
#1152 add node spacing to flowchart configuration
2020-01-05 22:03:53 +01:00
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
96fc0d043e
#1146 Added cypress test for dash line (dependecy) rendering
2020-01-02 19:57:11 +01:00
4e6aad5115
#834 Using & as a separator for the multiple nodes
2020-01-02 18:52:50 +01:00
7bd1408de0
Merge pull request #1165 from jgreywolf/1064-ClickEventInClassDiagram
...
1064 click event in class diagram
2020-01-02 08:10:48 -08:00
33916cfbd3
Adding interaction tests for gantt callbacks with arguments
2020-01-01 12:03:29 -08:00
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
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
bc59d015e6
#1154 Flow diagram DB shape request
2019-12-31 16:30:03 +01:00
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
7b12c7a07d
Fix infinite loop caused by date iteration
2019-12-24 19:01:29 -08:00
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
233520b797
#702 improve handling of different "br" tag notations for multiline texts in sequence diagrams
2019-12-21 20:39:32 +01:00
a4e7305d52
#834 Adding unit tests and rendering tests
2019-12-18 19:13:56 +01:00
fcf20215a6
#552 Adding rendering test
2019-12-11 21:12:48 +01:00
1811318dea
#1088 Adding rendering tests
2019-12-11 20:17:51 +01:00
363d49b655
Renumber render tests
2019-12-11 10:34:51 -08:00
de8c6d5572
Merge branch 'develop' into 1104(b)-SupportForAbstractMethodInClassDiagram
2019-12-11 10:31:27 -08:00
5b4e95484e
Merge pull request #1120 from jgreywolf/1063-GenericTypeSupportInClassDiagrams
...
Class: Generic type support
2019-12-11 19:09:19 +01:00
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
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
ab191abd5a
#903 Fix for broken build
2019-12-07 15:06:44 +01:00
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
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
346328156a
#1110 Adding tests for this case and some calcuations for width
2019-12-02 21:10:37 +01:00
753bd7e1d9
Update class diagrams to handle comments
...
updated regex in parser to correctly handle comments in class diagrams. Also updated flowchart parser to remove unused elements for comments, as well as modifying the regex to match
2019-11-26 11:23:07 -08:00
b57492c1c6
Initial checkin
2019-11-26 11:22:21 -08:00
5736d523dd
Merge pull request #1081 from jgreywolf/Bug1061-CannotMarkMembersAsProtectedInClassDiagram
...
Bug/1061 Cannot mark members as protected in class diagram
2019-11-21 20:54:15 +01:00
5004b5723d
Added separate render test
2019-11-21 11:17:53 -08:00
f6028b63b6
#1078 Using the configuration of the arrowMarkerAbsolute
2019-11-20 19:06:46 +01:00
68c2ea38c9
Bug1061-CannotMarkMembersAsProtectedInClassDiagram
...
Using # to indicate protected status of a member or method causing parser error when not used inside class declaration brackets {}. Removed '#' from `LABEL` regex
2019-11-19 12:49:59 -08:00
3f8f9f6711
#1055 Better selectors
2019-11-08 20:15:48 +01:00
d01f494277
Merge branch 'master' into develop
2019-11-08 19:32:54 +01:00
fa7d1ac554
#1023 Fix for interaction tests
2019-11-07 19:42:09 +01:00
09bf54f9af
#1038 Updated prefix for the internal dom id
2019-11-07 19:14:06 +01:00
7208f045c1
add test for multiple class diagram
2019-11-05 17:54:52 +09:00
e4a2d2a290
Updated Jest test cases for Pie diagram
2019-10-30 18:29:26 +01:00
034a7c424d
#1033 Better handling of multiline notes
2019-10-27 17:16:29 +01:00
b113436055
#1033 Fix for diagram bounds and viewbox
2019-10-27 16:58:32 +01:00
a5cc1e804b
#1031 Adding stricter code checks
2019-10-27 15:24:56 +01:00
d1c74070ab
#1029 Fix for issues after switching to master branch of dagre-d3
2019-10-24 19:33:13 +02:00
66152b42ae
#1023 New line in transition labels, basic support
2019-10-23 21:16:59 +02:00
4a1eb55127
#1022 Fix for long names for state diagrams
2019-10-23 19:22:36 +02:00
0ce42e6185
Merge pull request #994 from edekadigital/bug-478
...
#478 API crashes on 2nd render() call
2019-10-15 19:40:29 +02:00
d743838716
#478 API crashes on 2nd render() call
...
- add e2e test for (re)rendering by api
2019-10-15 17:36:02 +02:00
047ce2949a
#989 Added font styling classes to diagrams lacking then
2019-10-13 19:16:35 +02:00
53bdfee057
#989 Font configuration
2019-10-12 16:53:21 +02:00
chris moran