06f74a8c15
updated integration tests
2020-11-17 14:34:48 +01:00
ae1880311e
Support attribute definitions for entities in ERDs
2020-11-02 09:41:46 +00:00
851cff4bb8
Merge branch 'develop' into bug/1710_underscore_in_entity_names
2020-10-23 10:02:50 +01:00
245e25f4b7
Allow underscores in entity names, and entities with no relationships
2020-10-23 10:00:17 +01:00
7c939860d6
#1740 Adding test
2020-10-22 18:47:32 +02:00
d8da24804f
#1724 Adding fontawesome to edge labels
2020-10-15 19:29:37 +02:00
4ae61ad35a
€1726 updated test
2020-10-15 19:06:38 +02:00
cc1560d3e3
#1726 fix for link styling and classes for subgraph
2020-10-15 18:42:58 +02:00
4b2d98129e
#1704 handling of subgraph data
2020-10-07 20:43:31 +02:00
f0a8eaa5be
Merge pull request #1697 from mermaid-js/1676_click_support_v2
...
Adds support for custom cssClasses for classDiagram-v2. Also, improved test cases for classDiagram.
2020-09-23 20:41:52 +02:00
93bf8d7414
#1696 Fix for custom cssClass test cases for classDiagram
2020-09-23 20:16:06 +02:00
ce23316008
#1694 Applying styles from the graph definition for flowcharts
2020-09-23 19:51:16 +02:00
f856782528
#1657Fix for broken test
2020-09-20 12:31:39 +02:00
c9ff70b3cc
#1657 Handling class definitions for flowchart beta
2020-09-20 12:14:04 +02:00
a26c9fca1e
#1676 Fix for additonal usecases for flowchart
2020-09-16 21:53:17 +02:00
22c710ed99
#1676 Fix for broken test cases
2020-09-16 18:59:53 +02:00
28c01f6476
Merge branch 'develop' of https://github.com/knsv/mermaid into 1542_take_two
2020-09-09 18:43:53 +02:00
4f8e242dac
2020-09-06 22:34:13 +02:00
9106c6ad52
#1602 Update of handling of nested subgraphs
2020-09-02 20:34:24 +02:00
b244118fd9
Fix for class title label css
2020-08-27 20:43:37 +02:00
99844b4ca3
Add e2e tests on all diagrams
2020-08-25 17:17:52 +02:00
184fcab0b7
resolves #1490 consistent SVG height and width between diagrams
2020-08-25 15:46:10 +02:00
0cbd002667
#1607 Using correct config when to decide about sanitizing text
2020-08-23 20:02:51 +02:00
89b4f84b0a
Update classDiagram-v2 spec test case name
2020-08-19 20:55:46 +02:00
455cd9c696
Merge branch 'develop' of https://github.com/knsv/mermaid into 1542_take_two
2020-08-19 18:45:24 +02:00
6b23c71bb5
Use courier in all rendering tests
2020-08-16 21:49:36 +02:00
236332d8c7
Use arial in stateDiagram rendering tests
2020-08-16 13:50:27 +02:00
de72d7ba13
Use arial in stateDiagram rendering tests
2020-08-16 13:19:01 +02:00
ba6d73fc17
Debug of fonts in percy renderings
2020-08-16 13:01:45 +02:00
01344a991d
Add support for changing the length of edges
...
Resolves #637 , resolves #1495 .
The syntax for edges is extended to allow for extra
dashes/equals signs/dots (depending on the edge type). Each added
character increases the length of the edge by one rank level, as
follows:
Length | 1 | 2 | 3 |
------------------|:------:|:-------:|:--------:|
Normal | `---` | `----` | `-----` |
Normal with arrow | `-->` | `--->` | `---->` |
Thick | `===` | `====` | `=====` |
Thick with arrow | `==>` | `===>` | `====>` |
Dotted | `-.-` | `-..-` | `-...-` |
Dotted with arrow | `-.->` | `-..->` | `-...->` |
This features leverages the `minlen` property exposed by Dagre which was
not previously available when using Mermaid.
2020-08-14 00:15:26 +02:00
bde7b1a828
Html labels set to false in tests
2020-08-13 19:19:19 +02:00
9891b383e7
Adding classDiagram-v2 test cases
2020-08-13 18:52:04 +02:00
1f051d7a9f
1181-Css for class diagrams
...
Initial change for supporting custom CSS for use with classDiagrams.
updated `LABEL` regex for specificity
2020-08-03 12:47:50 -07:00
36e421eb5f
Merge pull request #1586 from mermaid-js/1542_take_two
...
1542 take two
2020-07-30 08:58:56 +02:00
a4bf85b1b6
#1542 Making sure config and directives works for overriding theme variables using initialize call or directives + tests
2020-07-29 18:38:59 +02:00
cf70678188
Merge branch 'develop' into feature/1460_add_link_target_to_flowchart_click
2020-07-28 13:21:31 +02:00
d04d8c3a1d
#1460 Add link target option to flowchart click
2020-07-28 10:49:54 +02:00
e5b22684cd
Fixed a parser warning in classDiagram
...
Fixed a regression bug I introduced in theme.spec.js
2020-07-27 09:57:04 -04:00
c8f652aaa8
Merge branch 'mermaid-js-develop' into develop
2020-07-27 03:23:04 -04:00
108a50f3bb
Merge branch 'mermaid-js-develop' into develop
2020-07-26 08:59:22 -04:00
06d80032fe
#1578 Fetching updated configuration before use
2020-07-26 08:00:43 +02:00
dc2d52fc09
testing the label width in percy
2020-07-24 19:14:42 +02:00
cb675300b1
Directive support added to journey
...
Fixed an issue in journey svgDraw.drawText expected an attribute (textMargin) but did not receive one and raised an error: <tspan> attribute x: Expected length, "NaN".
Added parseDirective to journeyDb
2020-07-23 05:58:15 -04:00
b93ef22687
#1562 Fix for test
2020-07-21 12:31:05 +02:00
cb79302867
#1562 Updated handling of pointsarray when the point is already in the array
2020-07-21 12:01:08 +02:00
08064c4243
#1542 Adding khroma for color manipulations
2020-07-18 15:15:50 +02:00
e8af778962
#1542 Updated test
2020-07-18 13:52:51 +02:00
bbc9532444
#1454 Adding showcase diagrams rendered with the different themes
2020-07-15 14:02:19 +02:00
fe5d9e486b
#1485 Fixing for test
2020-07-15 13:29:35 +02:00
61684830bf
2020-07-12 11:15:32 +02:00
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
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
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
85e58faa78
#945 White background and forks in composite mode
2019-10-10 17:57:29 +02:00
54e6e2f66e
#945 Some bug fixes and draft docs
2019-10-09 20:05:24 +02:00
fe1e09f06b
Merge branch 'feature/945_state_diagrams'
2019-10-09 18:16:32 +02:00
aaac86fd9d
#949 Added cypress test case for class diagram cardinality support
2019-10-08 21:46:03 +02:00
6b4a8325ae
Merge branch 'feature/963_class_annotations' of https://github.com/chris579/mermaid into develop
2019-10-08 12:49:52 +02:00
ce0b0fa0c8
#945 Divider lines for concurrency
2019-10-06 15:44:31 +02:00
dce09586cd
#945 Support for forks and joins
2019-10-06 14:11:17 +02:00
4f1186a610
#945 Support for notes, better width and handling of +/-
2019-10-06 11:35:46 +02:00
1cb52a602a
#945 Support for notes
2019-10-06 10:52:37 +02:00
3b731282e3
#945Renabling support for descriptions
2019-10-05 12:15:14 +02:00
d4306e61c2
#945 Some cleanup
2019-10-05 09:02:20 +02:00
92eec664b1
test fix
2019-10-05 00:57:58 +02:00
3ca9347361
test fix
2019-10-05 00:05:47 +02:00
704d36a7eb
adjusted integration test
2019-10-04 23:58:06 +02:00
65cbfbdb40
#945 Tweaking
2019-10-03 19:54:07 +02:00
7865fd4f02
#945 Rendering of composite state in a box
2019-10-03 19:08:15 +02:00
f9f8785aef
#945 Recursive object from parsing and stateDb
2019-10-02 19:32:13 +02:00
94afcfb6f9
#945 Rendering of state descriptions
2019-09-29 15:50:43 +02:00
3cffd1e3ed
#945 Rendering of labels and new label positioning algorithm
2019-09-28 13:31:10 +02:00
fad76ad534
#945 Rendering of start & end node
2019-09-25 21:01:21 +02:00
244be86207
E2e test of interaction in graphs
2019-09-18 19:42:19 +02:00
21622f575b
Updating cypress tests
2019-09-18 18:25:06 +02:00
42fc23cff2
#22 Basic Pie Chart
2019-09-11 21:20:28 +02:00
9f87ab4941
#927 Adding support for cypress and Percy
2019-09-11 18:53:05 +02:00
Marc Faber