Commit Graph

626 Commits

Author SHA1 Message Date
ashishj c58a04bc94 Fix broken configuration spec test 2022-04-28 18:26:50 +02:00
ashishj 5aac0734d5 Fix for broken Requirement diagram cypress test 2022-04-28 18:26:31 +02:00
ashishj 386f3c7ce9 Merge branch 'develop' into feature/hideUnusedParticipants_1210 2022-04-28 17:38:48 +02:00
Knut Sveidqvist c0bdf9d99b
Merge pull request #2958 from mermaid-js/decode_entities_update
Removal of vulnerability
2022-04-21 21:25:08 +02:00
Knut Sveidqvist df87ab8818 Fix for vulnerability 2022-04-21 21:11:48 +02:00
Yash-Singh1 4c93870580 feat: add hideUnusedParticipants and some cleanup 2022-04-14 19:19:18 -07:00
Knut Sveidqvist 7d2e77a1b3
Merge pull request #2915 from gwincr11/cg-req-access
feat: Add accessibility fields to requirements diagram
2022-04-12 07:19:40 +02:00
Cory Gwin 3d7cb212c0 feat: Add accessibility fields to requirements diagram 2022-04-07 18:02:48 +00:00
Adam B 65b0b83625 Adds accDescription, draws tags to svg 2022-04-07 10:05:54 -04:00
Nicolas Newman f67254cdc7 Merge branch 'develop' of https://github.com/mermaid-js/mermaid into feature/2776_katex_math 2022-04-02 08:09:11 -09:00
Nicolas Newman cc2c828e78 feat(katex): added cypress testing 2022-04-02 08:00:56 -09:00
ashishj bbac11a4b8 Updated rendering test with fixed id 2022-03-31 19:49:42 +02:00
Knut Sveidqvist f6421734a2 Merge branch 'develop' into 1252_gitgraph_reinvented 2022-03-31 19:16:31 +02:00
Knut Sveidqvist fca58aafb1 Test updates when switching to cypress-image-snapshoits 2022-03-31 19:14:37 +02:00
Knut Sveidqvist 3c0a2f0fd0 chore: replacing percy with cypress-image-snapshots 2022-03-31 18:06:04 +02:00
ashishj 3ee141ff9b Added Gitgraph docs 2022-03-24 20:28:30 +01:00
Ashish Jain a7c33b7d5a Replacing master to main in test cases 2022-03-17 19:19:25 +01:00
Ashish Jain 1ef58e286c Fixed rendering test cases 2022-03-17 19:07:16 +01:00
Ashish Jain 21c97f9521 added rendering tests 2022-03-10 20:08:56 +01:00
Guy Adler 04454cece0
fix: changed open and close markers as recommended
chnged from `()(` and `())` to `(((` and `)))`
2022-02-17 17:22:38 +01:00
Guy Adler e1f0e69263
feat(flowchart): implement double circle node
The implementation uses two circles, inside each other.
A double circle node is opend with `()(` and closed with `)()`.
2022-02-16 23:05:46 +01:00
Knut Sveidqvist 91ec41762a #2632 Adding proper handling of cardinalities 2022-01-16 15:14:59 +01:00
Eirik Bjornset d3577eb59b fix: bug #2346 "ER-attribute comments not work" 2021-12-29 21:27:51 +01:00
Knut Sveidqvist 9c12502a36 #2560 Tetsing that the added css have balanced brackets 2021-12-14 23:54:31 +01:00
Knut Sveidqvist d0cf3fc96a Merge 2021-12-08 11:55:49 +01:00
Knut Sveidqvist e0a05f83d1 Lint fix 2021-12-08 08:42:12 +01:00
Knut Sveidqvist 89ce930de2 Adding integration test 2021-12-07 22:55:28 +01:00
Knut Sveidqvist 3526e35012 Fix for node with wrong type 2021-11-30 20:28:51 +01:00
Knut Sveidqvist a018789026 Merge remote-tracking branch 'origin/develop' into develop 2021-11-30 19:24:10 +01:00
Knut Sveidqvist d9e598aa7f testcommit 2021-11-30 19:12:39 +01:00
Yash-Singh1 a3b2ba736d feat(flowchart): Allow default in the node ID 2021-11-25 13:48:28 -08:00
Matthieu MOREL d84be0d792 Enable eslint-plugin-jest, eslint-plugin-cypress and wider scan 2021-11-18 23:57:16 +01:00
Knut Sveidqvist fcbd8a5081 #2496 Fix for issue 2021-11-17 20:08:39 +01:00
Knut Sveidqvist 69ecb02375 Merge branch 'develop'
Conflicts:
	dist/mermaid.core.js
	dist/mermaid.core.js.map
	dist/mermaid.esm.min.mjs
	dist/mermaid.js
	dist/mermaid.js.map
	dist/mermaid.min.js
	dist/mermaid.min.js.map
2021-11-04 21:23:29 +01:00
Ashish Jain 250c9beff9 #2425 Added new test case 2021-10-21 19:45:15 +02:00
Ashish Jain a06f6f9604 Add sanitize to properties and link in Sequence Diagram 2021-10-07 21:48:44 +02:00
Ashish Jain aa666d1829 Merge branch 'release/8.13.2' into develop 2021-09-29 20:22:57 +02:00
Ashish Jain 5d5808880f Merge branch 'release/8.13.1' into develop 2021-09-29 20:22:09 +02:00
Knut Sveidqvist 8ee3155f2a Fix for broken test 2021-09-29 20:20:44 +02:00
Ashish Jain 38ef061175 Reverting PR #2312 2021-09-29 18:22:35 +02:00
Knut Sveidqvist db8517a7f9 Adding xss tests 2021-09-29 08:52:12 +02:00
Knut Sveidqvist 75b79e1b23 State diagram sanitization 2021-09-29 08:45:07 +02:00
Knut Sveidqvist b62d0d974f
Merge pull request #2312 from cm-wada-yusuke/bug/2160-fixed-height-useMaxWith
configureSvgSize should make height 100% when useMaxWidth is true.
2021-09-23 19:32:43 +02:00
Ashish Jain 165a10ac37 Fix for broken classDiagram-v2.spec.js test case 2021-09-23 18:36:45 +02:00
Knut Sveidqvist 004e7e376d
Merge branch 'develop' into feature/2249_sequence_diagram_popup_menus 2021-09-18 10:19:07 +02:00
Knut Sveidqvist 9c511559ff #2315 Adding to docs and an integration test 2021-09-18 07:51:15 +02:00
Yusuke Wada 0839fadbc2 fix e2e 2021-09-15 12:47:24 +09:00
Knut Sveidqvist 8bd830c991
Merge branch 'develop' into feature/field-classifier 2021-09-13 21:45:47 +02:00
eajenkins 85d33ecccd Added support for a new link syntax per recommendation:
link <actor>: <label> @ <link-url>

Removed documentation for class/icon definitions until we can finalize the design for this.

Fixed prettier errors.
2021-09-10 16:27:07 -07:00
Knut Sveidqvist b6ba4b2fd8
Merge pull request #2237 from RonaldZielaznicki/2070_more_columns_for_entity_relationship_diagrams
2070: Update ER Diagram to have keys and comments.
2021-09-09 17:50:38 +02:00
E Jenkins ce6d8576ae
Merge branch 'develop' into feature/2249_sequence_diagram_popup_menus 2021-08-27 15:02:11 -07:00
eajenkins 291bec7e90 Initial implementation for Issue#2249.
Includes changes to sequence diagram code to enable popup menus and individualized styling of actors
Includes unit and e2e tests.
Includes updates to the md file for sequencediagrams.
2021-08-27 10:56:56 -07:00
Ashish Jain f07a777194
Merge pull request #2271 from mermaid-js/2270_direction_class
2270 Adding support for direction statements in class diagrams.
2021-08-26 18:30:12 +02:00
Knut Sveidqvist 0658a363cb #2270 Add support for direction statements for classDiagrams 2021-08-26 17:05:10 +02:00
Xavier Stouder 46a7039ae9 test: e2e test 2021-08-26 11:36:21 +02:00
Ashish Jain 0fba1c06b4 Updated test cases for class diagram v2 2021-08-20 17:28:57 +02:00
Ashish Jain 69a9829041 Updated test cases for class diagram v2 2021-08-20 17:12:46 +02:00
Ashish Jain 2434a94aae Updated test cases for class diagram v2 2021-08-19 21:27:11 +02:00
MOREL Matthieu 55faa3cb1a yarn build and adapt e2e tests
Co-Authored-By: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-18 16:49:00 +02:00
RonaldZielaznicki 3383da514a Update ER Diagram to have keys and comments.
Update ER Diagrams to have keys and comments.
2021-08-12 16:18:54 -04:00
Knut Sveidqvist 7fcb1ae9b3 #2177 Updating cypress and percy 2021-07-07 16:41:36 +02:00
Knut Sveidqvist ed0947d761 Updated test 2021-06-27 00:57:28 +02:00
Knut Sveidqvist 6564bad85e Updated test 2021-06-27 00:40:14 +02:00
Knut Sveidqvist 6b9462f606 Preventing xss manipulation using onerror with the antiscript setting. 2021-06-27 00:24:19 +02:00
Knut Sveidqvist 3d22fa5d24 2122 Blöockling javascript urls 2021-06-08 20:08:04 +02:00
Knut Sveidqvist aa2596b457 #2111 Handling 'false' as false 2021-06-03 20:47:24 +02:00
Knut Sveidqvist 4c92592aa1 #2050 Updating tests and adding docs 2021-05-18 22:34:24 +02:00
Knut Sveidqvist 09569301f1 #2050 Adding possibility to render subgrapgs in different directions 2021-05-18 21:15:06 +02:00
Knut Sveidqvist d1180a5c69 Fix for broken rendering test 2021-05-16 10:59:07 +02:00
Knut Sveidqvist 84941607df Fix for links between composie states 2021-05-16 10:44:34 +02:00
Knut Sveidqvist 560951d597 Updated test 2021-05-09 15:57:44 +02:00
Knut Sveidqvist d3d0df59cb 2021-05-09 15:34:02 +02:00
Knut Sveidqvist e3164d8d44 #2055 Fix for how ids are set to notes 2021-05-09 11:12:22 +02:00
Knut Sveidqvist aa39dcc34f #2035 Growing composite state width with title 2021-05-02 08:44:28 +02:00
Knut Sveidqvist 6dc71122b8 #2032 Adding new statement to add choice shape in state diagrams 2021-05-01 18:09:42 +02:00
Knut Sveidqvist fab98633a4 Updated test 2021-04-30 10:46:48 +02:00
Knut Sveidqvist 11f3cbdb36 #1958 Handling multiple edges from and to the same node tuple 2021-04-30 10:34:50 +02:00
Knut Sveidqvist de8bdb96bd Final tweaks 2021-04-30 09:04:09 +02:00
Knut Sveidqvist a9f14d9ffe Adding image test for failing testcase 2021-04-29 19:27:04 +02:00
Knut Sveidqvist 45918da48e Updated tests 2021-04-25 12:27:59 +02:00
Knut Sveidqvist cef6273dcf Updated tests 2021-04-25 12:27:51 +02:00
Knut Sveidqvist b69ad0a3d2 Fix for broken test 2021-04-25 10:59:01 +02:00
Knut Sveidqvist f7750e5f04 Style fix for topAxis and added integration test 2021-04-25 10:41:59 +02:00
Knut Sveidqvist 3209986df1 #1955 Fix for tests 2021-03-23 20:10:58 +01:00
Knut Sveidqvist 87458657f8 #1955 Different selector in order to make it possible to change the text color for flowcharts vis classDef statements 2021-03-23 19:22:10 +01:00
Knut Sveidqvist 4e7ecb3f30 Merge branch 'master' into develop 2021-03-13 16:45:27 +01:00
Knut Sveidqvist 0f31471b2e #1940 Fix 2021-03-11 20:57:45 +01:00
Knut Sveidqvist 4395a5f404 Added tests to trigger the xss attack (and fail initially) 2021-03-11 19:51:05 +01:00
Knut Sveidqvist d66727cb35 Render test for requirement diagrams and updated showcase diagrams 2021-02-28 10:28:31 +01:00
Knut Sveidqvist 229f5b0c51 Updated rendering test 2021-02-18 19:52:50 +01:00
Knut Sveidqvist fc5693067c #1874 #1865 Fix for rgression issue 2021-01-28 07:52:17 +01:00
Marc Faber 0c724d1a88 fix integration tests 2021-01-23 21:48:36 +01:00
Marc Faber bf8e7a3590 #1783 Apply styles to all types of flowchart node shapes 2021-01-23 20:17:36 +01:00
Knut Sveidqvist ea9a893c24 #1865 Making title color woitk when htmnlLabels are used 2021-01-23 16:07:25 +01:00
Knut Sveidqvist 1c0b167c95 Merge branch 'develop' of https://github.com/designsforhealth/mermaid into designsforhealth-develop 2020-12-17 20:44:23 +01:00
Knut Sveidqvist 9c36b2bef7 Added e2e test for the new argument handling for flowcharts and graph 2020-12-17 19:58:25 +01:00
Johnny Walker 0fe1fb76d1 test: add tests for sequence diagram text wrap updates 2020-12-12 02:01:40 -05:00
GDFaber f62189b381
Merge pull request #1781 from mermaid-js/bug/1751_flowchart_subgraph_styles
Apply style settings to subgraphs in "flowchart" diagrams
2020-11-18 00:42:30 +01:00
Marc Faber 55532c00b4 Revert updates on integration tests due to failing PR tests 2020-11-18 00:34:02 +01:00
Marc Faber a16bbb8046 #1751 apply style settings to subgraphs in "flowchart" diagrams 2020-11-17 23:18:11 +01:00
Marc Faber 06f74a8c15 updated integration tests 2020-11-17 14:34:48 +01:00
Adrian Hall ae1880311e Support attribute definitions for entities in ERDs 2020-11-02 09:41:46 +00:00
Adrian Hall 851cff4bb8 Merge branch 'develop' into bug/1710_underscore_in_entity_names 2020-10-23 10:02:50 +01:00
Adrian Hall 245e25f4b7 Allow underscores in entity names, and entities with no relationships 2020-10-23 10:00:17 +01:00
Knut Sveidqvist 7c939860d6 #1740 Adding test 2020-10-22 18:47:32 +02:00
Knut Sveidqvist d8da24804f #1724 Adding fontawesome to edge labels 2020-10-15 19:29:37 +02:00
Knut Sveidqvist 4ae61ad35a €1726 updated test 2020-10-15 19:06:38 +02:00
Knut Sveidqvist cc1560d3e3 #1726 fix for link styling and classes for subgraph 2020-10-15 18:42:58 +02:00
Knut Sveidqvist 4b2d98129e #1704 handling of subgraph data 2020-10-07 20:43:31 +02:00
Knut Sveidqvist 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
Ashish Jain 93bf8d7414 #1696 Fix for custom cssClass test cases for classDiagram 2020-09-23 20:16:06 +02:00
Knut Sveidqvist ce23316008 #1694 Applying styles from the graph definition for flowcharts 2020-09-23 19:51:16 +02:00
Knut Sveidqvist f856782528 #1657Fix for broken test 2020-09-20 12:31:39 +02:00
Knut Sveidqvist c9ff70b3cc #1657 Handling class definitions for flowchart beta 2020-09-20 12:14:04 +02:00
Ashish Jain a26c9fca1e #1676 Fix for additonal usecases for flowchart 2020-09-16 21:53:17 +02:00
Ashish Jain 22c710ed99 #1676 Fix for broken test cases 2020-09-16 18:59:53 +02:00
Ashish Jain 28c01f6476 Merge branch 'develop' of https://github.com/knsv/mermaid into 1542_take_two 2020-09-09 18:43:53 +02:00
Knut Sveidqvist 4f8e242dac 2020-09-06 22:34:13 +02:00
Knut Sveidqvist 9106c6ad52 #1602 Update of handling of nested subgraphs 2020-09-02 20:34:24 +02:00
Ashish Jain b244118fd9 Fix for class title label css 2020-08-27 20:43:37 +02:00
Guillaume Grossetie 99844b4ca3 Add e2e tests on all diagrams 2020-08-25 17:17:52 +02:00
Guillaume Grossetie 184fcab0b7 resolves #1490 consistent SVG height and width between diagrams 2020-08-25 15:46:10 +02:00
Knut Sveidqvist 0cbd002667 #1607 Using correct config when to decide about sanitizing text 2020-08-23 20:02:51 +02:00
Ashish Jain 89b4f84b0a Update classDiagram-v2 spec test case name 2020-08-19 20:55:46 +02:00
Ashish Jain 455cd9c696 Merge branch 'develop' of https://github.com/knsv/mermaid into 1542_take_two 2020-08-19 18:45:24 +02:00
Knut Sveidqvist 6b23c71bb5 Use courier in all rendering tests 2020-08-16 21:49:36 +02:00
Knut Sveidqvist 236332d8c7 Use arial in stateDiagram rendering tests 2020-08-16 13:50:27 +02:00
Knut Sveidqvist de72d7ba13 Use arial in stateDiagram rendering tests 2020-08-16 13:19:01 +02:00
Knut Sveidqvist ba6d73fc17 Debug of fonts in percy renderings 2020-08-16 13:01:45 +02:00
Mattéo Delabre 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
Knut Sveidqvist bde7b1a828 Html labels set to false in tests 2020-08-13 19:19:19 +02:00
Ashish Jain 9891b383e7 Adding classDiagram-v2 test cases 2020-08-13 18:52:04 +02:00
Justin Greywolf 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
Knut Sveidqvist 36e421eb5f
Merge pull request #1586 from mermaid-js/1542_take_two
1542 take two
2020-07-30 08:58:56 +02:00
Knut Sveidqvist 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
Knut Sveidqvist cf70678188
Merge branch 'develop' into feature/1460_add_link_target_to_flowchart_click 2020-07-28 13:21:31 +02:00
Marc Faber d04d8c3a1d #1460 Add link target option to flowchart click 2020-07-28 10:49:54 +02:00
chris moran 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
chris moran c8f652aaa8
Merge branch 'mermaid-js-develop' into develop 2020-07-27 03:23:04 -04:00
chris moran 108a50f3bb
Merge branch 'mermaid-js-develop' into develop 2020-07-26 08:59:22 -04:00
Knut Sveidqvist 06d80032fe #1578 Fetching updated configuration before use 2020-07-26 08:00:43 +02:00
Knut Sveidqvist dc2d52fc09 testing the label width in percy 2020-07-24 19:14:42 +02:00
chris moran 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
Knut Sveidqvist b93ef22687 #1562 Fix for test 2020-07-21 12:31:05 +02:00
Knut Sveidqvist cb79302867 #1562 Updated handling of pointsarray when the point is already in the array 2020-07-21 12:01:08 +02:00
Knut Sveidqvist 08064c4243 #1542 Adding khroma for color manipulations 2020-07-18 15:15:50 +02:00
Knut Sveidqvist e8af778962 #1542 Updated test 2020-07-18 13:52:51 +02:00
Knut Sveidqvist bbc9532444 #1454 Adding showcase diagrams rendered with the different themes 2020-07-15 14:02:19 +02:00
Knut Sveidqvist fe5d9e486b #1485 Fixing for test 2020-07-15 13:29:35 +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
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
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 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 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
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 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 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
Justin Greywolf 0495103635 Fix regex and Fix incorrect test 2020-06-08 19:21:33 -07:00
Adrian Hall f1c05bc909 Ensure empty quoted relationship labels are accepted in ER diagrams 2020-05-23 13:33:44 +01: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 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
Russell Geraghty 433f88b459 Merge remote-tracking branch 'upstream/develop' into feature/user-journey 2020-04-13 20:08:20 +01: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
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 f081527731 User journey handler 2020-04-04 16:38:30 +01: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
Adrian Hall 9199546dca Alter ERD syntax for compatibility with PlantUML 2020-03-29 08:42:20 +01:00
Adrian Hall d3f78299e7 Add integration tests, basic docs, and fix multi-diagram bug 2020-03-18 16:53:26 +00: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 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 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
Marc Faber c7b46f4fba #1218 Fix anchor and script support in link click events 2020-01-26 16:56:42 +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 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 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 346328156a #1110 Adding tests for this case and some calcuations for width 2019-12-02 21:10:37 +01:00
Justin Greywolf 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
Justin Greywolf b57492c1c6 Initial checkin 2019-11-26 11:22:21 -08:00
Knut Sveidqvist 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
Justin Greywolf 5004b5723d Added separate render test 2019-11-21 11:17:53 -08:00
Knut Sveidqvist f6028b63b6 #1078 Using the configuration of the arrowMarkerAbsolute 2019-11-20 19:06:46 +01:00
Justin Greywolf 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
Knut Sveidqvist 3f8f9f6711 #1055 Better selectors 2019-11-08 20:15:48 +01:00
Knut Sveidqvist d01f494277 Merge branch 'master' into develop 2019-11-08 19:32:54 +01:00
Knut Sveidqvist fa7d1ac554 #1023 Fix for interaction tests 2019-11-07 19:42:09 +01:00
Knut Sveidqvist 09bf54f9af #1038 Updated prefix for the internal dom id 2019-11-07 19:14:06 +01:00
MATSUDA Takashi 7208f045c1 add test for multiple class diagram 2019-11-05 17:54:52 +09:00
Ashish Jain e4a2d2a290 Updated Jest test cases for Pie diagram 2019-10-30 18:29:26 +01:00
Knut Sveidqvist 034a7c424d #1033 Better handling of multiline notes 2019-10-27 17:16:29 +01:00
Knut Sveidqvist b113436055 #1033 Fix for diagram bounds and viewbox 2019-10-27 16:58:32 +01:00
Knut Sveidqvist a5cc1e804b #1031 Adding stricter code checks 2019-10-27 15:24:56 +01:00
Knut Sveidqvist d1c74070ab #1029 Fix for issues after switching to master branch of dagre-d3 2019-10-24 19:33:13 +02:00
Knut Sveidqvist 66152b42ae #1023 New line in transition labels, basic support 2019-10-23 21:16:59 +02:00
Knut Sveidqvist 4a1eb55127 #1022 Fix for long names for state diagrams 2019-10-23 19:22:36 +02:00
Knut Sveidqvist 0ce42e6185
Merge pull request #994 from edekadigital/bug-478
#478 API crashes on 2nd render() call
2019-10-15 19:40:29 +02:00
Kolja Markwardt d743838716 #478 API crashes on 2nd render() call
- add e2e test for (re)rendering by api
2019-10-15 17:36:02 +02:00
Knut Sveidqvist 047ce2949a #989 Added font styling classes to diagrams lacking then 2019-10-13 19:16:35 +02:00
Knut Sveidqvist 53bdfee057 #989 Font configuration 2019-10-12 16:53:21 +02:00
Knut Sveidqvist 85e58faa78 #945 White background and forks in composite mode 2019-10-10 17:57:29 +02:00
Knut Sveidqvist 54e6e2f66e #945 Some bug fixes and draft docs 2019-10-09 20:05:24 +02:00
Knut Sveidqvist fe1e09f06b Merge branch 'feature/945_state_diagrams' 2019-10-09 18:16:32 +02:00
Ashish Jain aaac86fd9d #949 Added cypress test case for class diagram cardinality support 2019-10-08 21:46:03 +02:00
Ashish Jain 6b4a8325ae Merge branch 'feature/963_class_annotations' of https://github.com/chris579/mermaid into develop 2019-10-08 12:49:52 +02:00
Knut Sveidqvist ce0b0fa0c8 #945 Divider lines for concurrency 2019-10-06 15:44:31 +02:00
Knut Sveidqvist dce09586cd #945 Support for forks and joins 2019-10-06 14:11:17 +02:00
Knut Sveidqvist 4f1186a610 #945 Support for notes, better width and handling of +/- 2019-10-06 11:35:46 +02:00
Knut Sveidqvist 1cb52a602a #945 Support for notes 2019-10-06 10:52:37 +02:00
Knut Sveidqvist 3b731282e3 #945Renabling support for descriptions 2019-10-05 12:15:14 +02:00
Knut Sveidqvist d4306e61c2 #945 Some cleanup 2019-10-05 09:02:20 +02:00
Christian Klemm 92eec664b1
test fix 2019-10-05 00:57:58 +02:00
Christian Klemm 3ca9347361
test fix 2019-10-05 00:05:47 +02:00
Christian Klemm 704d36a7eb
adjusted integration test 2019-10-04 23:58:06 +02:00
Knut Sveidqvist 65cbfbdb40 #945 Tweaking 2019-10-03 19:54:07 +02:00
Knut Sveidqvist 7865fd4f02 #945 Rendering of composite state in a box 2019-10-03 19:08:15 +02:00
Knut Sveidqvist f9f8785aef #945 Recursive object from parsing and stateDb 2019-10-02 19:32:13 +02:00
Knut Sveidqvist 94afcfb6f9 #945 Rendering of state descriptions 2019-09-29 15:50:43 +02:00
Knut Sveidqvist 3cffd1e3ed #945 Rendering of labels and new label positioning algorithm 2019-09-28 13:31:10 +02:00
Knut Sveidqvist fad76ad534 #945 Rendering of start & end node 2019-09-25 21:01:21 +02:00
Knut Sveidqvist 244be86207 E2e test of interaction in graphs 2019-09-18 19:42:19 +02:00
Knut Sveidqvist 21622f575b Updating cypress tests 2019-09-18 18:25:06 +02:00
Ashish Jain 42fc23cff2 #22 Basic Pie Chart 2019-09-11 21:20:28 +02:00
Knut Sveidqvist 9f87ab4941 #927 Adding support for cypress and Percy 2019-09-11 18:53:05 +02:00