Commit Graph

370 Commits

Author SHA1 Message Date
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
Chris Moran 9d413680d9
Fixed a rendering issue introduced while trying to fix dark mode. This should fix the rendering of note text for all current themes. 2020-06-14 13:42:25 -04:00
Chris Moran 6309dd1350
Merge branch 'develop' of https://github.com/mermaid-js/mermaid into mermaid-js-develop 2020-06-14 11:40:15 -04:00
Chris Moran 0ae001ed6d
Fixed issue with idea-multimarkdown.
- JavaFX does not support lookbehind
 - (?) It also appears that named regex groups are also unsupported for both mermaid and javafx

Update:
 - Fixed an issue where setLogLevel did not properly handle 'named' log levels
 - Backwards compatibility should be preserved, any/all %%{...}%% directives will be correctly processed by the grammar and properly ignored for any/all graph types that do not support them.

 - Multiline directives will render an error (as they should) if they are not accounted for in the .jison grammar
2020-06-14 11:34:39 -04:00
Chris Moran 620c894929
Fixed issue causing idea-multimarkdown headaches: util changes. Reworking them. 2020-06-14 06:53:22 -04:00
Chris Moran 04b4da0c75
## Work in progress.
Implemented directives per PR review comment:

%%{directive: json-encoded-arg-string}%%

example:

%%{init: { 'logLevel': 0, 'theme': 'dark' }}%%

Also changed wrap and config to directives:

%%{wrap}%%
%%{config: { 'fontSize': 18 }}%%
2020-06-11 15:35:00 -04:00
Toan 6e13718cbd naming the link/connector edgeLabel and edgePath to let easy query and custom. 2020-06-11 11:42:14 +07:00
Chris Moran 4a253a7760
Merged with mainline develop 2020-06-08 14:58:42 -04:00
Chris Moran bd11663e0a
Added auto wrap option (and grammar) for sequenceDiagrams
Added inline config and init(ialization) grammar
Added reinitialize functionality to mermaidAPI (not to be confused with initialize)
Added actorFontWeight, noteFontWeight, messageFontWeight, wrapEnabled, wrapPadding
Added wrapLabel and breakWord functions to intelligently wrap text based on a pixel-based width instead of column-based
  - The implementation is largely from Carys Mills: https://medium.com/@CarysMills/wrapping-svg-text-without-svg-2-ecbfb58f7ba4
  - Made slight modifications for mermaid-js
Fixed dark theme color inconsistencies for sequence diagrams
Removed !important from sequence scss as this prevents any client overrides
Fixed various invalid css values in sequence scss which prevented proper rendering of various elements
Added detectInit to utils for initialization json detection
Updated detectType to support the existence or absence of the intialization configuration
Updated calculateTextWidth to include fontWeight
2020-06-08 14:48:03 -04:00
Knut Sveidqvist 7c4bff567b Merge branch 'master' into develop 2020-06-07 11:08:26 +02:00
Knut Sveidqvist e9e5c75dec 8.5.2 Release build 2020-06-07 10:39:21 +02:00
Knut Sveidqvist 85a8feec9d Also fix for error handling when setting mermaid.parseError 2020-06-06 12:42:35 +02:00
Marc Faber 1cc94f8353 Add js and map files in dist folder to repository 2020-06-01 15:23:46 +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
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
Marc Faber d67e49400f #684 Fix applying default class to flowchart nodes 2020-02-24 01:31:39 +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 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
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
Marc Faber 1cfd93640c #743 handle multiline section titles in gantt diagrams 2020-01-08 13:50:58 +01: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
Marc Faber bc59d015e6 #1154 Flow diagram DB shape request 2019-12-31 16:30:03 +01: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 5eb50cb2b6
Merge pull request #1132 from GDFaber/develop_Bugfixes_linkStyle_910_1088
Flow: Bugfixes for link style
2019-12-11 20:04:32 +01:00
Knut Sveidqvist f6ef6ff7db
Merge pull request #1130 from GDFaber/develop
Flow: Add stadium shape for nodes
2019-12-11 19:48:47 +01:00
Marc Faber 608445e64f #910 set correct position and style for edge labels when using linkStyle, #1088 handle multiline texts in edge labels when using linkStyle 2019-12-10 03:51:37 +01:00
Marc Faber 1f4be77662 Revert "#910 set correct position and style for edge labels when using linkStyle, #1088 handle multiline texts in edge labels when using linkStyle" - Sorry, forgot to push to a new branch.
This reverts commit 0deae4abf9.
2019-12-10 03:48:12 +01:00
Marc Faber 0deae4abf9 #910 set correct position and style for edge labels when using linkStyle, #1088 handle multiline texts in edge labels when using linkStyle 2019-12-10 03:34:40 +01:00
Marc Faber 9a0df5afb0 #723 Add stadium shape for flowchart nodes 2019-12-08 16:51:47 +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
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 031c0b7b21 #945 Increasing size, handling forks and joins in multiple directions 2019-10-10 20:55:27 +02:00
Knut Sveidqvist 85e58faa78 #945 White background and forks in composite mode 2019-10-10 17:57:29 +02:00
Knut Sveidqvist 554189908d
Merge pull request #970 from mearns/issue-530-hexagon
Add hex shape for flow charts
2019-10-08 21:43:10 +02:00
Christian Klemm 612df99c34
added tests + alt syntax 2019-10-04 23:49:58 +02:00
Christian Klemm 912e850db4
added grammar 2019-10-04 21:49:02 +02:00
Brian Mearns 57921e3f52 #530 Add Hex example to index.html 2019-10-02 22:31:41 -04:00
Marc Faber 095233e6cf Flowchart parsing issue with CRLF #894 2019-09-27 01:05:25 +02:00
Knut Sveidqvist a3142aad69 Adding some test pages 2019-08-20 20:07:12 +02:00
Alexander Sage 5c25c5563a chore: Added e2e snapshot tests 2019-07-23 21:07:01 -07:00
Alexander Sage c8091c61c0 feat: sequence diagram background rect 2019-07-22 22:47:49 -07:00
knsv f11d1a6fa1 #847 Better sanitizing of urls 2019-07-22 02:18:09 -07:00
knsv c33533082c #847 Handling of embedded javascript in links 2019-07-21 07:39:36 -07:00
knsv 5dd392127f Release docs 2019-07-21 02:23:23 -07:00
knsv 8e27318eda #847 fix for case texts with multiple br tags, explanation in usage doc on how to avoid labels out of bounds. 2019-07-16 16:05:22 -07:00
Knut Sveidqvist 5abedab095 e2e test for stricter security in mermaid 2019-07-14 02:05:59 -07:00
Jason Würtz a671576578 feat(index.html): add example to display new behavior 2019-07-07 16:51:40 -03:00
Knut Sveidqvist 3e9e5acdab Fix of merge conflicts 2019-06-29 10:33:44 +02:00
Adam Wulf 03abeacea4 Added parallelograms. 2019-06-25 23:15:43 -05:00
Adam Wulf 99169398b7 Simpler syntax for trapezoid nodes 2019-06-25 23:06:53 -05:00
Adam Wulf 24600355c8 Merge remote-tracking branch 'origin/master' into flow/trapezoid 2019-06-25 22:36:13 -05:00
Knut Sveidqvist 5667694652 info diagram to show version of mermaid, bugfixes for gantt chart 2019-06-15 14:29:26 +02:00
Knut Sveidqvist e0a70bd352 Merge of latest changesin to pr #804 2019-06-09 12:40:37 -07:00
Knut Sveidqvist fe913ec10f
Merge pull request #705 from Vrixyz/602-cardinality-not-showing
wip: class diagram  cardinality display
2019-06-09 11:22:03 -07:00
Knut Sveidqvist 23693bd57e
Merge pull request #845 from Qix-/style-subgraph
Support styling of subgraphs
2019-05-28 22:22:45 +02:00
Josh Junon f51596eb61 Support styling of subgraphs 2019-05-24 17:08:45 +02:00
abzicht 6ede0f6166 Allowing brackets in taskTxt, adjusted index.html example to include brackets in task text 2019-03-10 14:07:33 +01:00
abzicht c44ff8a70f Adding a gantt clickable example to the existing gantt diagram 2019-03-10 13:56:49 +01:00
João Paulo Poffo 997cdfffb4 Doc HTML 2019-02-06 17:00:51 -02:00
Casey Watson 2fc5745c58 Support Multi-line Actor Descriptions
- Add support for <br/> delimiter in actor descriptions.
- Add actorFontFamily and actorFontSize options to sequence diagram.
- Change default actor description font from times to sans.

Fix #384 #702 #755
2018-11-26 11:49:33 -07:00
Adam Wulf 9326e91832 Adding trapezoid and inverse trapezoid vertex options. 2018-10-10 02:25:44 -05:00
Vrixyz 97e26686f4 wip #602 cardinality display 2018-07-29 18:50:57 +02:00
Tyler Long f2ea725edb Add a sample to test diagram cut off issue 2018-04-12 07:39:02 +08:00
Tyler Long a5627f97ff Make diamond shape a little bit bigger 2018-03-21 22:06:44 +08:00
Tyler Long f8da3c2e48 More padding to fix cutoff issue 2018-03-20 23:04:01 +08:00
Tyler Long 33da5bcee1 Fix flowchart cut off issue 2018-03-20 20:08:52 +08:00
Tyler Long 13ec3f6c0d Support all d3 curves 2018-03-18 09:35:28 +08:00
Tyler Long a949c2aaec config.sequenceDiagram backwards compatibility 2018-03-18 09:08:05 +08:00
Tyler Long f1d2808594 Support flowchart curve as option 2018-03-17 23:05:14 +08:00
Tyler Long 52d0605066 Fix subgraph issue 2018-03-17 18:12:24 +08:00
Tyler Long 015b976c28 Fix CSS cannot select number ID issue 2018-03-17 09:10:10 +08:00
Tyler Long 93201b2ded
Merge pull request #641 from sopherio/master
SequenceDiagram: Add support for multiple alt else statements
2018-03-16 20:03:44 +08:00
Tyler Long 2d560861df Support Custom CSS 2018-03-15 21:47:53 +08:00
Stefan Sechelmann 45b81a9db9 add par and alt examples to index.html 2018-03-15 14:08:37 +01:00
Tyler Long 23dfe1e8a9 Fix classDef issue 2018-03-14 21:36:10 +08:00
Tyler Long 594847ba04 Release 8.0.0-alpha.7 2018-03-13 21:18:09 +08:00
Tyler Long f3fcfb635b Gantt numberSectionStyles should be 4 2018-03-13 21:17:32 +08:00
Tyler Long f62736c749 Support customization of gantt diagram xAxis format using diagram code 2018-03-13 14:01:44 +08:00
Tyler Long 8a20a71906 Test a complex sequence diagram 2018-03-13 10:54:39 +08:00
Tyler Long 37076d3d1f Support global config of gantt axisFormat 2018-03-12 21:33:02 +08:00
Tyler Long 388ec2cd97 Get log level correct 2018-03-06 18:56:37 +08:00
Tyler Long 8848203d90 Fix issues of last PR 2017-12-26 20:58:54 +08:00
Thomas LEVEIL 8db7d73dc0 add quick test for clickable flow chart node with tooltip 2017-12-03 04:29:49 +01:00
Tyler Long fe0434cb16 Release 7.0.17 2017-09-12 23:13:49 +08:00
Tyler Long a6f992ce5b Allow user to configure theme 2017-09-12 22:54:50 +08:00
Tyler Long 72493b7a8b Correct way to handle inline style 2017-09-12 22:06:19 +08:00
Tyler Long d07a7f505b Update folder structure in dist folder 2017-09-10 22:29:37 +08:00
Tyler Long c9442653e9 Replace require with import 2017-09-10 19:41:34 +08:00
Tyler Long cb9a7f4cd1 Remove dist/www 2017-09-01 16:04:22 +08:00