Commit Graph

1860 Commits

Author SHA1 Message Date
Knut Sveidqvist b468065c6b Adding dompurify 2021-07-05 11:38:24 +02:00
Knut Sveidqvist 67050e4d6d #2170 Adjusting tests 2021-07-05 11:10:26 +02:00
Knut Sveidqvist 5437ab7057 #2170 Lint fix 2021-07-05 10:27:15 +02:00
Knut Sveidqvist 2f73fd3a9d #2170 Adding dompurify 2021-07-05 10:21:11 +02:00
Knut Sveidqvist 6b9462f606 Preventing xss manipulation using onerror with the antiscript setting. 2021-06-27 00:24:19 +02:00
Knut Sveidqvist 9cc4f73cab
Merge pull request #2151 from mermaid-js/2125_switch_state_renderer
#2125 Switching default renderer for state diagrams
2021-06-25 12:06:25 +02:00
Knut Sveidqvist d0d87497c5 #2125 Switching default renderer for state diagrams 2021-06-25 11:08:57 +02:00
Knut Sveidqvist db049f9c8e
Merge pull request #2119 from lishid/develop
fix: Assign proper namespaces to foreignObject children
2021-06-25 10:30:50 +02:00
Knut Sveidqvist c1335955f4
Merge pull request #2133 from mermaid-js/2132_style_journey_diagram
FIX: Added new theme user journey diagram specific theme variables
2021-06-25 10:28:00 +02:00
Knut Sveidqvist 62c6b9d886
Merge pull request #2109 from fabiospampinato/no-useless-prod-deps
Removed some non-production dependencies from the list of production dependencies
2021-06-25 10:27:17 +02:00
Ashish Jain 8b55b83256 Added new theme user journey diagram specific theme variables 2021-06-15 14:21:25 +02:00
Knut Sveidqvist 3d22fa5d24 2122 Blöockling javascript urls 2021-06-08 20:08:04 +02:00
lishid e0652539fb fix: Assign proper namespaces to foreignObject children 2021-06-06 16:57:47 -04:00
Knut Sveidqvist 26ede9b015 Small positoining fix for parallell processes and nested composite states 2021-06-06 11:37:23 +02:00
Knut Sveidqvist e6e94ad57e
Merge pull request #2115 from mermaid-js/2111_placeholder
2111 placeholder
2021-06-05 12:11:13 +02:00
Knut Sveidqvist e0c3b8e269 Lint fix 2021-06-04 07:27:44 +02:00
Yusuke Wada 9861c081db fix typo 2021-06-04 13:56:11 +09:00
Knut Sveidqvist 916df3ff4f Fix for styling 2021-06-03 21:41:29 +02:00
Knut Sveidqvist c0b65e9304 Fox fr keeping the label background in state diagrams 2021-06-03 21:27:53 +02:00
Knut Sveidqvist aa2596b457 #2111 Handling 'false' as false 2021-06-03 20:47:24 +02:00
Fabio Spampinato 359ea05680 Removed unused dependency "he" 2021-06-03 13:23:26 +01:00
Knut Sveidqvist bf21aa8cd6 #2088 Add the possibility to theme forks and joins using theme variables 2021-05-23 10:42:07 +02:00
Knut Sveidqvist 529824e2b3 #2088 Add the possibility to theme forks and joins using theme variables 2021-05-23 08:12:32 +02:00
Knut Sveidqvist 6e6ced2cee #2088 Add the possibility to theme forks and joins using theme variables 2021-05-22 20:13:31 +02:00
Knut Sveidqvist 4c92592aa1 #2050 Updating tests and adding docs 2021-05-18 22:34:24 +02:00
Knut Sveidqvist 0bbefdc48f #2050 Adjusted default value for direction in subgraphs 2021-05-18 21:36:04 +02:00
Knut Sveidqvist 09569301f1 #2050 Adding possibility to render subgrapgs in different directions 2021-05-18 21:15:06 +02:00
Knut Sveidqvist cea1441eeb #2072 fix for composite states 2021-05-17 18:49:53 +02:00
Knut Sveidqvist 84941607df Fix for links between composie states 2021-05-16 10:44:34 +02:00
Knut Sveidqvist af4930e3f3 Expandingh with of subgraphs whith title 2021-05-16 08:21:28 +02:00
Knut Sveidqvist 0a4f16737a #2072 Handle width of clusters with wide titles 2021-05-15 18:52:06 +02:00
Knut Sveidqvist 417428acea Removed some console statememnts and updated version 2021-05-10 18:14:47 +02:00
Knut Sveidqvist d208f58084 SMall styling fix for choices in state diagrams 2021-05-10 07:44:28 +02:00
Knut Sveidqvist 6dcc538777 2021-05-09 16:24:36 +02:00
Knut Sveidqvist 75769c46de 2021-05-09 15:42:31 +02:00
Knut Sveidqvist d3d0df59cb 2021-05-09 15:34:02 +02:00
Knut Sveidqvist 43f6ae7ba0 Add the directive state ment for change rendering direction in composite states 2021-05-09 15:25:51 +02:00
Knut Sveidqvist e3164d8d44 #2055 Fix for how ids are set to notes 2021-05-09 11:12:22 +02:00
Knut Sveidqvist 4720ede442 #2045 name change of state diagram specific theme variable 2021-05-09 10:56:39 +02:00
Ashish Jain 37136c9bef #1648, #1656 Making Pie Chart more configurable 2021-05-07 17:02:08 +02:00
Ashish Jain fb5970d4db
Merge pull request #2038 from mermaid-js/2017_std_req_diagrams
2017 std req diagrams
2021-05-07 02:49:32 +02:00
Knut Sveidqvist 2de9d491c3 #2045 Small fix for alt ackground in state diagrams 2021-05-06 22:16:31 +02:00
Knut Sveidqvist 30909bd6fe #2045 Fix for text color in state diagram v1 in dark 2021-05-06 20:43:34 +02:00
Knut Sveidqvist 2104c983e9 #2045 Fix for default value 2021-05-06 20:29:07 +02:00
Knut Sveidqvist 30faf7bfad #2045 Adjusted styling css to make use of state diagram theme variables 2021-05-06 20:26:00 +02:00
Knut Sveidqvist 785e5552ae Merge branch 'pie_chart_themeing' into state-diagram-themeing 2021-05-06 07:52:09 +02:00
Knut Sveidqvist a1cd398e4d 2021-05-06 07:50:24 +02:00
Ashish Jain edb06b12e9 #2043 Added PieChart theme variable support 2021-05-06 03:09:36 +02:00
Ashish Jain 1337ffe9e5 #2043 Added PieChart theme variable support 2021-05-06 01:41:24 +02:00
Ashish Jain 5157b2eff4 #2017 Fix for theme variable border size for requirement title line 2021-05-03 16:22:54 +02:00
Ashish Jain 257ed8dc92 #2017 Added useage of theme variable requirementTextColor 2021-05-03 16:22:25 +02:00
Ashish Jain ea12f5b2ec #2017 Fix for theme variable border size for requirement box 2021-05-03 16:21:47 +02:00
Ashish Jain 34bd9b58e8 #2017 Fix for theme variable border size for requirement box 2021-05-03 16:19:00 +02:00
Ashish Jain 83754410f3 #2017 Fix for clearing diagram data (helpful for live editor) 2021-05-03 16:17:38 +02:00
Ashish Jain ae36704b66 #2017 Fix for missing docRef 2021-05-03 16:16:18 +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 b20f8668be Fix for test 2021-04-30 19:34:25 +02:00
Knut Sveidqvist d8d624870d Adjustments 2021-04-30 19:25:45 +02:00
Knut Sveidqvist 1e6ed7be02 #2029 Adding option to configure default renderer 2021-04-30 17:27:05 +02:00
Knut Sveidqvist 973369e7f1 Lint fix 2021-04-30 17:20:53 +02:00
Knut Sveidqvist 0185d75b05 Reversal of simple fix for grap directions flips 2021-04-30 17:18:50 +02:00
Knut Sveidqvist 2240333df1 #2026 Fix for descriptions of composite states 2021-04-30 13:50:21 +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 4e6b9ec947 Removed debug code from label 2021-04-30 10:05:20 +02:00
Knut Sveidqvist de8bdb96bd Final tweaks 2021-04-30 09:04:09 +02:00
Knut Sveidqvist ce84278f10 Better track of the order of the edge and removing debug code 2021-04-29 19:24:07 +02:00
Knut Sveidqvist 8955e0a6b1 Fix for first case 2021-04-29 18:50:12 +02:00
Knut Sveidqvist 8f09514dd7 #2017 Standardization of requirement diagrams 2021-04-26 19:08:16 +02:00
Knut Sveidqvist 8c57df1945
Merge pull request #1997 from Mister-Hope/develop
docs: update setup config
2021-04-25 11:07:02 +02:00
Knut Sveidqvist 62b8f78937 Merge branch 'develop' of github.com:mermaid-js/mermaid into develop 2021-04-25 10:48:39 +02:00
Knut Sveidqvist 1b66b3c3fb
Merge pull request #1982 from ahmadnassri/develop
fix: re-write id generator
2021-04-25 10:45:27 +02:00
Knut Sveidqvist f7750e5f04 Style fix for topAxis and added integration test 2021-04-25 10:41:59 +02:00
Knut Sveidqvist adab9819bd
Merge pull request #1954 from nacc/gantt-top-xaxis
Gantt: add top xaxis
2021-04-25 10:16:46 +02:00
Mr.Hope a6dfaa0076 docs: fix a wrong value in mermaidAPI docs 2021-04-24 16:03:32 +08:00
Mr.Hope 97563c1f2a docs: update defaultConfig docs 2021-04-24 15:56:26 +08:00
Mr.Hope 68d0002d6b docs: update setup config 2021-04-24 13:13:49 +08:00
Ahmad Nassri f78d8b3e5e
fix(lint): correct lint errors 2021-04-12 16:28:14 -04:00
Ahmad Nassri 84f664de14
fix(id-generator): re-write generator to allow it to function properly after compiling in cli 2021-04-12 15:56:17 -04:00
Nishanth Aravamudan b558d67fcd ganttRenderer: put top axis, if configured at the top 2021-04-01 15:45:36 -05:00
Nishanth Aravamudan f78d4b13eb gantt: only display topAxis if configured or directive is set 2021-04-01 15:45:36 -05:00
Nishanth Aravamudan 120b89041b gantt: add a toplevel topAxis configuration option 2021-04-01 15:45:36 -05:00
Nishanth Aravamudan 2d0aab223c gantt: add a topAxis directive to allow per diagram configuration 2021-04-01 15:45:36 -05:00
Nishanth Aravamudan 6629061abd gantt/ganttRenderer: add top x-axis for large Gantt charts
I am leveraging a Gantt chart to generate a years-long Roadmap from text.
This is for a large team, so it is quite large. A request I get from my
stakeholders is for a top labelling axis in parallel to the current bottom
one, so that the dates are labelled no matter where we are scrolled on
the screen.
2021-04-01 15:45:36 -05:00
Nishanth Aravamudan 79b30153ba gantt/ganttRenderer: rename xAxis to bottomXAxis 2021-04-01 15:45:36 -05:00
Knut Sveidqvist 1b3971d6da
Merge pull request #1967 from mermaid-js/1966_journey_padding
Journet diagrams handling of right margin
2021-04-01 08:52:26 +02:00
Knut Sveidqvist f86bdd648a Setting better height 2021-03-28 10:17:12 +02:00
Knut Sveidqvist f47b83235a
Merge pull request #1937 from Rutorai/feature/1802_notes_remain_bright
Feature/1802 notes remain bright
2021-03-24 07:36:22 +01:00
Knut Sveidqvist a18543862f #1995 Adding circle and ellipse 2021-03-23 21:57:15 +01:00
Knut Sveidqvist 30dfbbbd68 #1995 Adding polygons 2021-03-23 21:48:49 +01:00
Knut Sveidqvist 4339fadd50 #199 Handling path as well as rect when htmlLabels are off 2021-03-23 21:33:39 +01:00
Knut Sveidqvist 1ae074d05f #1955 Fix for non htmlLabels 2021-03-23 21:13:52 +01:00
Knut Sveidqvist 84c9dd0dad #1955 Fix for non htmlLabels 2021-03-23 20:51:16 +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 b789d44fd6
Merge pull request #1935 from ahmadnassri/develop
fix: correct method calls for deterministic ids
2021-03-18 21:01:19 +01:00
Knut Sveidqvist c269dc822c UPdated default curve for flowcharts to basis 2021-03-15 20:57:07 +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
Justin Greywolf 407996b00b
Merge pull request #1907 from TreyE/better_class_name_literals
Better class name literals
2021-03-11 10:35:10 -08:00
Knut Sveidqvist 10b002889c An update to the theme natural 2021-03-11 18:34:51 +01:00
Knut Sveidqvist b50eea26ed A theme change for neutral and new default value for curve to natural 2021-03-11 18:33:59 +01:00
Rutorai 76da6598c6 Use of secondary background, textcolor and border for notes when using the dark theme 2021-03-10 21:25:58 +01:00
Ahmad Nassri 395bf25e1a
style: correct lint errors 2021-03-10 13:50:49 -05:00
Ahmad Nassri ba8b49c703
fix: correct method calls for deterministic ids
Fixes #1870
2021-03-10 11:39:51 -05:00
Trey Evans 438884b866 Add class name literals, with less conflicts. 2021-03-01 14:14:23 -05:00
Knut Sveidqvist 749f16d875 Lint fix 2021-02-28 11:44:51 +01:00
Knut Sveidqvist 82618f0184 #1920 Making flocharts adhere to the curve configuration also changing the default configuration for grpah and flowchart 2021-02-28 11:29:56 +01:00
Knut Sveidqvist 623056fe20 Reverting unintentional config change 2021-02-27 13:24:54 +01:00
Knut Sveidqvist f2e75e730b Merge branch '1903_journey_config' into 1906_gantt_font 2021-02-27 13:09:23 +01:00
Knut Sveidqvist 5e8b8ab3e3 Merge branch '1903_journey_config' into 1906_gantt_font 2021-02-27 13:08:35 +01:00
Knut Sveidqvist b1d21b0e3f Merge branch 'develop' into 1906_gantt_font 2021-02-27 13:07:02 +01:00
Knut Sveidqvist 184351c932 Lint fix, removed unsued variable 2021-02-27 13:05:12 +01:00
Knut Sveidqvist c0d0e80fe0 Merge branch 'develop' into 1903_journey_config 2021-02-27 13:03:55 +01:00
Knut Sveidqvist 0646b43144
Merge pull request #1911 from Rutorai/bug/1651_milestone_incorrect_vertical_position
The vertical position was wrongly based on index in sorted array.
2021-02-27 12:52:30 +01:00
Knut Sveidqvist ef63a0661b
Revert "#1317 : Add state id to state diagram. Move description below separa…" 2021-02-27 10:51:36 +01:00
Knut Sveidqvist 1293850a09
Merge pull request #1912 from hopoverflow/patch-1
#1317 : Add state id to state diagram.  Move description below separa…
2021-02-27 10:39:37 +01:00
Knut Sveidqvist 30b265a425 Removed configuration not used 2021-02-27 10:28:15 +01:00
Knut Sveidqvist 62e196e802
Merge pull request #1910 from JoshSharpe/feature/requirement_diagram
Feature/1909_requirement diagram
2021-02-27 10:26:22 +01:00
hopoverflow 7cc7a8f47c
#1317 : Add state id to state diagram. Move description below separator.
Fix issue #1317
2021-02-26 13:16:00 -08:00
Rutorai b9859a1e57 The vertical position was based on index in sorted array. It must be done by stored order 2021-02-26 07:58:23 +01:00
Josh Sharpe 45518580a4 Small bug fix with requirement diagram naming. 2021-02-25 21:25:38 -05:00
Knut Sveidqvist 021bc5f011 Making the font size being configurable and addting the ability set the section font size 2021-02-25 10:06:13 +01:00
Josh Sharpe 55251e1024 First pass at a requirement diagram. 2021-02-23 23:27:13 -05:00
Knut Sveidqvist 693de2996a #1903 Use central configuration tools 2021-02-23 20:56:01 +01:00
Knut Sveidqvist 9677aaa715
Revert "Add class name literals." 2021-02-18 20:26:58 +01:00
Harshil Parmar 0728533676
Merge branch 'develop' into enhancement/standardized_naming 2021-02-06 16:04:14 +05:30
harshilparmar 7019a1149d Change logger to log 2021-02-06 15:56:05 +05:30
harshilparmar edd7bc7197 remove eslint comment 2021-02-03 16:01:32 +05:30
harshilparmar 8b191f038e resolve eslint issue 2021-02-02 13:02:55 +05:30
harshilparmar eb206cb687 Standardized naming in the log functionality 2021-02-02 08:33:44 +05:30
Trey Evans b974b3df3e Add class name literals. 2021-02-01 13:21:49 -05:00
Knut Sveidqvist 1b9d9fe12c #1874 #1865 Fix for regression issue - flowchart 2021-01-28 20:51:11 +01:00
Knut Sveidqvist fc5693067c #1874 #1865 Fix for rgression issue 2021-01-28 07:52:17 +01:00
Knut Sveidqvist 177cd30854 #1874 Protecting the original configuration 2021-01-27 22:23:33 +01:00
Knut Sveidqvist 2e5771b9e8 Merge branch 'develop' of github.com:mermaid-js/mermaid into develop 2021-01-27 21:24:53 +01:00
Marc Faber 1514ef18ec #1620 Fix arrow heads to be visible for all flowchart node shapes 2021-01-24 21:33:15 +01:00
Knut Sveidqvist a6cfb315f2 Merge branch 'develop' of github.com:mermaid-js/mermaid into develop 2021-01-24 08:33:03 +01:00
Knut Sveidqvist 9ec76f7ecb #1865 Additional styling fixes 2021-01-24 08:31:16 +01:00
Marc Faber 03edd00014 #1865 Making title color woitk when htmnlLabels are used (separated css rules for cluster text and span) 2021-01-23 22:36:20 +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 5d24a2b7d9 #1528 Adding async arrow type in sequence diagrams 2021-01-11 23:09:37 +01:00
Knut Sveidqvist e08ae8ed4a Merge branch 'develop' of github.com:mermaid-js/mermaid into develop 2020-12-17 20:50:41 +01:00
Ashish Jain 3e042f63e6
Merge pull request #1822 from ileler/develop
Fix for when the br tag is used
2020-12-17 20:49:26 +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
Ashish Jain 4da5df9c9b
Merge pull request #1823 from Yash-Singh1/patch-1
Removed 0% on pie chart
2020-12-17 20:39:48 +01:00
Ashish Jain 032d8781dc Updated the click_security_loose test case for classDiagram and classDiagram-v2 for new callback function arg 2020-12-17 20:26:12 +01:00
Johnny Walker 0fe1fb76d1 test: add tests for sequence diagram text wrap updates 2020-12-12 02:01:40 -05:00
ileler 8aa030539b fix e2e error 2020-12-12 09:52:39 +08:00
Johnny Walker 469a726285 fix: calculate text dimensions after wrapping message text 2020-12-11 20:43:12 -05:00
Johnny Walker 0103da13f0 fix: do not alter line breaks when drawing text 2020-12-11 20:43:12 -05:00
Johnny Walker c3ce525c6c fix: exclude text with line breaks when parsing wrap setting 2020-12-11 20:43:12 -05:00
Yash Singh 2b61d131dc
Removed 0% on pie chart 2020-12-10 08:53:04 -08:00
Matthieu MOREL 63b404be9f wrong index 2020-12-10 09:46:22 +01:00
Matthieu MOREL aaf031f501 Remove space 2020-12-10 09:44:45 +01:00
ileler a855f4bc67 Fix for when the br tag is used 2020-12-10 16:42:37 +08:00
Matthieu MOREL b97e71e83e Support old and new syntax 2020-12-10 09:35:46 +01:00
Matthieu MOREL 62768cd617 Wording : node instead of task 2020-12-08 09:56:44 +01:00
Matthieu MOREL 2d100197c8 rollback changes on class Diagram 2020-12-06 15:23:05 +01:00
Matthieu MOREL 4debc2dffb partial rollback on config factorization 2020-12-06 14:58:22 +01:00
Matthieu MOREL b1bb2dce16 config factorization 2020-12-06 14:44:40 +01:00
Matthieu MOREL 1940b63237 Call setTooltip only when you need it 2020-12-06 14:37:12 +01:00
Matthieu MOREL 5ca629ec90 parenthesis are mandatory 2020-12-06 14:14:04 +01:00
Matthieu MOREL e7852ea54e update diagrams and syntax and examples
add test for multiple arguments
2020-12-06 14:04:46 +01:00
Matthieu MOREL 84697eb9b0 6th rank instead of 7 2020-12-06 13:09:11 +01:00
Matthieu MOREL 884f6b3571 callback with tooltip without arguments 2020-12-06 13:02:24 +01:00
Matthieu MOREL aa9ecde7c8 prefix with href 2020-12-06 12:53:46 +01:00
Matthieu MOREL 1ead98b999 click event or link 2020-12-06 12:51:19 +01:00
Matthieu MOREL 2a14039733 exepect ids as first parameter 2020-12-06 11:12:14 +01:00
Matthieu MOREL 568962dadf interaction test update 2020-12-06 11:03:24 +01:00
Matthieu MOREL 7126d215b0 format 2020-12-06 10:45:13 +01:00
Matthieu MOREL 027342bba0 missing closing bracket 2020-12-06 10:38:26 +01:00
Matthieu MOREL 7b953ffefb Arguments handling for flow chart functions 2020-12-06 10:27:54 +01:00
Knut Sveidqvist 96ac13cdac Merge branch 'master' into develop 2020-11-26 19:25:57 +01:00
Knut Sveidqvist 2e7452f067 Lint fix 2020-11-26 19:15:45 +01:00
Julian Amelung c472024921
Add test cases for utils.initIdGeneratior 2020-11-23 23:54:00 +01:00
Julian Amelung 35cd3918df
Add different id generators 2020-11-23 23:05:41 +01:00
Knut Sveidqvist b329679d2d
Merge pull request #1773 from tomatoman25/bug/1759_state_notes
Changed regex for multi-line state notes
2020-11-19 17:48:53 +01: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 7ea18f5462 #1742 narrow down console logging when flowchart subgraphs are added 2020-11-18 00:02:10 +01:00
Marc Faber a16bbb8046 #1751 apply style settings to subgraphs in "flowchart" diagrams 2020-11-17 23:18:11 +01:00
Marc Faber 067f356010 #1767 Add sans-serif to default font settings 2020-11-17 11:36:34 +01:00
Neil Cuzon 555a38b819
Update mermaidAPI.js 2020-11-15 13:52:21 -08:00
Neil Cuzon acc2392c3d
Update mermaidAPI.js 2020-11-15 05:00:54 -08:00
Neil Cuzon f963238a75
Update mermaidAPI.js 2020-11-15 03:45:20 -08:00
Anthony 52d7f02dcb Changed regex for multi-line state notes 2020-11-13 14:10:42 -05:00
Adrian Hall 879da091d3 Fix padding for entities with no attributes 2020-11-05 11:56:57 +00:00
Adrian Hall 1ce4805bdc Merge branch 'develop' into feature/1531_ERD_attributes 2020-11-02 09:44:56 +00:00
Adrian Hall ae1880311e Support attribute definitions for entities in ERDs 2020-11-02 09:41:46 +00:00
Knut Sveidqvist 6aaec3dc96 Merge branch 'bug/1710_underscore_in_entity_names' of https://github.com/spopida/mermaid into spopida-bug/1710_underscore_in_entity_names 2020-10-31 11:10:24 +01:00
Adrian Hall 8870ba3b65 merge from updated develop 2020-10-30 14:40:45 +00:00
Adrian Hall 0c38e014d7 Support entity attributes 2020-10-30 13:45:35 +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
Lishid 69113a988f
Update theme-base.js 2020-10-22 22:17:43 -04:00
Lishid 521bfc66f0
Update theme-base.js 2020-10-22 22:14:10 -04:00
Lishid d473f3904a
Fixed bad tertiary operator
This fixes the tertiary operator used to compute the `edgeLabelBackground` theme variable.
2020-10-22 21:55:13 -04:00
Ashish Jain 3f6296b619 #1713, #1719, # 1720 2020-10-22 21:40:08 +02:00
Knut Sveidqvist f67a374444 Printing barnches and labels 2020-10-22 21:26:59 +02:00
Knut Sveidqvist 8435e3c856 Linting tmp fix 2020-10-22 19:54:13 +02:00
Knut Sveidqvist 6eaea38df7 Adding styling 2020-10-22 19:51:31 +02:00
Knut Sveidqvist 5fb572abaf Merge branch 'develop' into 1252_gitgraph_reinvented 2020-10-22 18:55:56 +02:00
Knut Sveidqvist b495772118 #1740 Adding fixing another tests 2020-10-22 18:52:23 +02:00
Knut Sveidqvist 310420fda1 2020-10-22 18:45:46 +02:00
Knut Sveidqvist d8da24804f #1724 Adding fontawesome to edge labels 2020-10-15 19:29:37 +02:00
Knut Sveidqvist 7404e436d2 #1726 Handling think lines 2020-10-15 19:00:35 +02:00
Knut Sveidqvist 4812437519 2020-10-15 18:42:58 +02:00
Knut Sveidqvist 6df9bf36e5 Work in progress 2020-10-15 17:49:39 +02:00
Knut Sveidqvist 582a045457 #1704 Test and lint 2020-10-07 20:43:52 +02:00
Knut Sveidqvist 4b2d98129e #1704 handling of subgraph data 2020-10-07 20:43:31 +02:00
Knut Sveidqvist c691ef1899 Removing console.logs 2020-09-30 18:47:50 +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
Knut Sveidqvist 2cbb2d7b6a
Merge pull request #1695 from mermaid-js/1694_style_flowchart
#1694 Applying styles from the graph definition for flowcharts
2020-09-23 20:11:39 +02:00
Knut Sveidqvist ce23316008 #1694 Applying styles from the graph definition for flowcharts 2020-09-23 19:51:16 +02:00
Ashish Jain c04dac65ac #1693 Added support for custom cssClass and styling to classDiagram-v2 2020-09-23 19:27:09 +02:00
Knut Sveidqvist c17778ba47
Merge pull request #1686 from irqbank/develop
Remove console messages
2020-09-20 14:31:31 +02:00
Knut Sveidqvist c9ff70b3cc #1657 Handling class definitions for flowchart beta 2020-09-20 12:14:04 +02:00
root 1461d535d4 Remove console messages 2020-09-19 00:52:45 -04:00
Ashish Jain 57a208d271 Fix for broken Flowchart test cases 2020-09-16 22:02:11 +02:00
Ashish Jain a26c9fca1e #1676 Fix for additonal usecases for flowchart 2020-09-16 21:53:17 +02:00
Knut Sveidqvist c679d18888 #1676 Fix for broken tests 2020-09-16 20:33:04 +02:00
Knut Sveidqvist 2a6372cabe #1676 Handling vertices starting with a number 2020-09-16 20:09:02 +02:00
Knut Sveidqvist a14ff7820e #1676 Fix for tests 2020-09-12 13:40:25 +02:00
Knut Sveidqvist a446b3c600 #1676 Lint fix 2020-09-12 13:35:11 +02:00
Knut Sveidqvist c8c4554299 #1676 Adding click support and tooltip support for flowchart 2020-09-12 10:56:23 +02:00
Knut Sveidqvist 6360ed52b2 #1676 lint fix 2020-09-10 21:00:25 +02:00
Knut Sveidqvist 9d8c867de8 #1676 Adding click support to the new rendering engine and classDiagram-v2 2020-09-10 20:58:16 +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 117988d26d
Merge pull request #1664 from saowang/develop
Fixed broken links and syntax in the document
2020-09-09 18:39:18 +02:00
Ashish Jain c95b9ffc43 Fix for legacy class Diagram title for class bold styling 2020-09-07 13:33:08 +02:00
saowang 5336e98e18
Update mermaidAPI.js 2020-09-07 14:50:33 +08:00
saowang 1f4be42b3f Fixed broken links and syntax in the document 2020-09-07 14:02:09 +08: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
Knut Sveidqvist a82c53dd2e Not moving the label away from assigned position 2020-08-29 16:11:42 +02:00
Ashish Jain b244118fd9 Fix for class title label css 2020-08-27 20:43:37 +02:00
Ashish Jain 7164eaa8b1 Allow Generics support for Class Title definition 2020-08-27 20:14:26 +02:00
Ashish Jain a20aa472d6 Fix for Edge label positioning 2020-08-27 19:59:30 +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 09f4c21421 Enable html labels for classDiagram-v2 2020-08-19 20:46:24 +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 aafb65f888 Lint fixes 2020-08-17 08:45:20 +02:00
Knut Sveidqvist 6b23c71bb5 Use courier in all rendering tests 2020-08-16 21:49:36 +02:00
Knut Sveidqvist ba6d73fc17 Debug of fonts in percy renderings 2020-08-16 13:01:45 +02:00
Knut Sveidqvist 450d4b5a0a Fix for broken build 2020-08-16 09:06:25 +02:00
Knut Sveidqvist 888b1fb021 #1613 #1495 Adding support for edge length to flowchart (beta) 2020-08-16 08:45:44 +02:00
Knut Sveidqvist 958b032cea Merge branch 'develop' of github.com:mermaid-js/mermaid into develop 2020-08-16 08:34:47 +02:00
Knut Sveidqvist 33cc635fcf Removed illegal logging 2020-08-14 07:37:29 +02:00
Knut Sveidqvist 129b3f9004 Cherry pick of config changes 2020-08-14 07:34:42 +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
Ashish Jain 060ac3bb4a Adjust the class members with proper parsing 2020-08-13 21:06:33 +02:00
Ashish Jain 95677e601a Merge branch '1614_fontFamily' of https://github.com/knsv/mermaid into 1542_take_two 2020-08-13 20:39:39 +02:00
Knut Sveidqvist 32457e83f0 Fix for broken build 2020-08-13 20:23:57 +02:00
Ashish Jain 2519486a02 Merge branch '1614_fontFamily' of https://github.com/knsv/mermaid into 1542_take_two 2020-08-13 20:09:13 +02:00
Ashish Jain bec3cc437d Fix for interface rendering and positioning 2020-08-13 20:08:09 +02:00
Knut Sveidqvist 525a32f9f0 2020-08-13 20:03:42 +02:00
Ashish Jain 36f8f1902c Removing hard coding with dynamic values for cardinalities 2020-08-13 19:41:33 +02:00
Ashish Jain 28bc87b873 Merge branch 'develop' into 1542_take_two 2020-08-13 18:27:37 +02:00
Justin Greywolf 5e72416478 1592-SVG syntax error with links
Added xlink namespace to svg definition
2020-08-12 13:47:21 -07:00
Knut Sveidqvist aacf84f78a Some documentation updates 2020-08-09 07:45:37 +02:00
Justin Greywolf f914cb0248 1594-Comment in class diagrams not working
Slight modification to comment regex to ensure that all lines were being looked at, not just the first one
2020-08-07 12:08:34 -07:00
Ashish Jain 61993a032a Initial implementation for cardinality position. 2020-08-07 14:52:42 +02:00
Justin Greywolf 9a86accc62 1181-Minor update to regex 2020-08-04 12:05:56 -07: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 e9e9b13df0 Added themeVariable references and som adjustments in base theme calculations. 2020-07-31 15:05:51 +02:00
Knut Sveidqvist 5565aab488 #1590 Theme base tweaked for custom theming 2020-07-30 19:18:18 +02:00
Knut Sveidqvist dbe6b9dacb #1590 Themes tweaked 2020-07-30 15:28:46 +02:00
Knut Sveidqvist dd866718b9 Removed console statements 2020-07-30 10:16:29 +02: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 f1836c281c #1542 Fix for secirity config 2020-07-30 08:20:27 +02:00
Knut Sveidqvist ecea0f90d4 #1542 Handling of config 2020-07-29 22:19:23 +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
Knut Sveidqvist b23988c947
Merge pull request #1582 from cmmoran/develop
Directive support for many diagrams, config bugfix
2020-07-28 13:17:35 +02:00
chris moran 06f6e75d5a
Class diagram parsing
Fixed a class diagram parsing issue
2020-07-28 07:00:04 -04:00
chris moran c9854b35e2
Fixed flowchart parsing (broken tests - grammar changes were not 100% correct) 2020-07-28 05:48:26 -04:00
Marc Faber d04d8c3a1d #1460 Add link target option to flowchart click 2020-07-28 10:49:54 +02:00
chris moran 283faf7a2f
Fixes
GraphObjects.md: [ and ] should be escaped in text (they're links otherwise)
flow.jison: fixed a parsing issue when the direction is omitted (defaults to 'TB')
stateRenderer-v2: was silently failing due to a try/catch in the parse function. (intentional?) removed to show errorHandler
mermaidAPI: removed unnecessary call to updateRendererConfigs since reinitialize does this
2020-07-28 04:45:22 -04:00
chris moran 0299ff0a79
Added directive support to state diagrams
Fixed an issue with markerUnits: (default is 'strokeWidth' not 0
2020-07-27 19:44:45 -04:00
chris moran 4ee65822aa
Merge remote-tracking branch 'carlosblanco/feature/1228-support-dashes-in-actor-names-in-sequence-diagrams' into develop 2020-07-27 15:05:57 -04:00
chris moran e7ca6c16ff
Tweaked PIE (got rid of some parsing conflicts) 2020-07-27 14:15:38 -04:00
chris moran 771bf78576
Fixed parsers to use the correct type name in close_directive
Added directive support to pie
(Refactored pie parsing to be a bit more clear)
Added more unit tests to pie
2020-07-27 13:24:23 -04:00
chris moran b9fa2f4125
Added directive parsing to gannt
Ensured tests pass
2020-07-27 10:16:41 -04: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 43d37ab1cf
Fixed a new config issue
Diagrams now properly reset to siteConfig when there are multiple diagrams on a single page
2020-07-27 08:54:45 -04:00
chris moran 1fc142a59f
Fixed a regression with classDiagram supporting comments 2020-07-27 07:38:12 -04:00
chris moran c4ad95760a
Fixed a regression in sequence diagram parsing.
Added the parser as the first argument to parseDirective to support custom directive handling (for now delegated within mermaidAPI but should probably discriminate based on type for delegation)
2020-07-27 06:50:54 -04:00
Knut Sveidqvist f0ed170b04 #1542 Setting up base theme for custom theming 2020-07-27 11:51:20 +02:00
chris moran 38d4b5be1a
Fixed an issue with flowchart rendering. Remember to render html, securityLevel='loose' must be set by the siteConfig. The default securityLevel as of now is 'strict'. This causes html to be url encoded. 2020-07-27 05:33:41 -04:00
Knut Sveidqvist 5a7d770a58 #1542 Setting up base theme for custom theming 2020-07-27 10:01:34 +02:00
chris moran c8f652aaa8
Merge branch 'mermaid-js-develop' into develop 2020-07-27 03:23:04 -04:00
Knut Sveidqvist 01d7a33230 Merge branch 'master' into develop 2020-07-26 22:37:10 +02:00
chris moran 108a50f3bb
Merge branch 'mermaid-js-develop' into develop 2020-07-26 08:59:22 -04:00
Knut Sveidqvist 95b7e4f9ad Theme tweaks 2020-07-26 14:09:48 +02:00
Knut Sveidqvist 3fb3453166 dark theme fixes 2020-07-26 12:13:06 +02:00
Knut Sveidqvist 62acc18e7d Merge of cherry pick 2020-07-26 08:03:56 +02:00
Knut Sveidqvist 06d80032fe #1578 Fetching updated configuration before use 2020-07-26 08:00:43 +02:00
Knut Sveidqvist c5b55fa476 Some small interim changes, adding theming.doc 2020-07-24 08:25:57 +02:00
Carlos Blanco b120c34177
Support dashes in actor names in sequence diagrams 2020-07-23 20:15:52 -06:00
chris moran 1b89189efa
re-add classDiagram as a theme type (in addition to class and classDiagram-v2 for class diagrams) 2020-07-23 06:03:04 -04:00
chris moran e53c5097f9
Merge branch 'mermaid-js-develop' into develop 2020-07-23 05:59:40 -04: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 dbda90b15b Fix if theme inclusion for classDiagrams 2020-07-23 07:50:22 +02:00
chris moran a54f3c8c7f
Refactor
Moved theme variables to the config module
2020-07-22 16:46:41 -04:00
Ashish Jain 71af9741cc Correct positioning for class title 2020-07-22 21:25:01 +02:00
Ashish Jain c9d4cac3ff Merge branch 'develop' into feature/Issue-1465_Class_migration 2020-07-22 19:33:20 +02:00
Ashish Jain a2932a0393 Merge branch 'master' into develop 2020-07-22 19:30:55 +02:00
Ashish Jain 6917303e1b Enabled styles.js for classDiagram-v2 2020-07-22 19:25:26 +02:00
Ashish Jain 03c19ccae9 Migrated style css from scss file to styles.js 2020-07-22 19:10:28 +02:00
Ashish Jain ff439369da Updated variable name to cnf 2020-07-22 18:27:25 +02:00
Ashish Jain 24e470a099 Merge branch 'develop' into feature/Issue-1465_Class_migration 2020-07-22 18:23:47 +02:00
Ashish Jain 07a7ea1f23 #1552 Fix for broken cardinality support for class diagrams 2020-07-22 17:35:01 +02:00
Ashish Jain 516649a508 Adjusting initial classDiagram shape rendering 2020-07-21 15:27:02 +02:00
Ashish Jain abe23250c4 Adjusting initial classDiagram shape rendering 2020-07-21 15:25:16 +02:00
Knut Sveidqvist 0f575907c7
Merge pull request #1560 from NeilCuzon/release/8.6.0
Edited Release/8.6.0
2020-07-21 12:56:38 +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 211d6f4005 2020-07-21 11:15:42 +02:00
Neil Cuzon ddee6d2b6a
Update config.js 2020-07-20 20:07:57 -07:00
Neil Cuzon 575c34467f
Merge branch 'develop' into release/8.6.0 2020-07-20 20:01:32 -07:00
Knut Sveidqvist a6ec038189
Merge pull request #1558 from mermaid-js/less_theme_variables
More theming tweaks
2020-07-20 17:37:18 +02:00
Knut Sveidqvist ffaf6c14e4 #154 trweaking some more, state diagram composit backgrounds 2020-07-20 17:10:59 +02:00
Knut Sveidqvist 3a6915c0b6 #154 lint fixes 2020-07-20 15:24:12 +02:00
Knut Sveidqvist 93a8c83a68 #1542 Alignment between themes 2020-07-20 15:15:03 +02:00
Knut Sveidqvist 1302addcdd #1542 Base theme for simple custom themeing 2020-07-20 14:13:05 +02:00
Knut Sveidqvist 490cbd3f0d
Merge pull request #1557 from cmmoran/develop
Render tweak - each diagram should reset the config to siteConfig upon rendering
2020-07-20 11:01:29 +02:00
chris moran f5f26f334f
Move detectInit higher in the render function. This prevents getConfig from potentially being called with the config changes from previous diagrams on the same page (or context)
This also allows mermaid the chance to reset the config to the siteConfig in between renderings
2020-07-20 04:45:10 -04:00
Knut Sveidqvist dba579b546 #1542 Gantt tweaks 2020-07-20 10:24:15 +02:00
Knut Sveidqvist fa68b8bb35 #1542 Some tweaks for sequence diagram 2020-07-20 10:05:46 +02:00
Knut Sveidqvist ceb84ce020 #1542 Dark theme fixes for gantt 2020-07-20 10:00:08 +02:00
Knut Sveidqvist 68aa7fa3a4 #1542 Dark theme fixes for pie and user-journey 2020-07-20 09:44:09 +02:00
Knut Sveidqvist 70cd0655ed #1542 Set default theme variables 2020-07-20 08:20:09 +02:00
Knut Sveidqvist 3c23de9735 #1542 Lint fixes 2020-07-19 21:15:58 +02:00
Knut Sveidqvist 91da46dd63 #1542 Theme adjustments 2020-07-19 21:10:52 +02:00
Knut Sveidqvist 4d280ff010 #1542 Making sure user overrides from directives ocerrides properly 2020-07-19 15:02:53 +02:00
Knut Sveidqvist 04493035cd #1542 Adding khroma for color in dark-theme 2020-07-18 15:51:17 +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
Neil Cuzon 26dba53d99
Update config.js 2020-07-18 04:39:33 -07:00
Knut Sveidqvist f7a6241ac0 #1542 Fix for markers in class diagrams 2020-07-18 09:57:55 +02:00
Knut Sveidqvist b6453383cf #1542 Handling of default values when no theme is set 2020-07-18 09:37:51 +02:00
Knut Sveidqvist 8d076efd71 #1542 Styling for all diagram types 2020-07-17 15:57:02 +02:00
Knut Sveidqvist f9667cd80f #1542 Test page using directoives to switch theme 2020-07-17 12:34:33 +02:00
Knut Sveidqvist 030b945828 #1542 Theme variables setup 2020-07-17 09:16:39 +02:00
Knut Sveidqvist fd4240b774 #1542 Setting theme options as the regular options 2020-07-16 23:39:38 +02:00
Knut Sveidqvist 8c0e022b44 Template for dynamic styles in place 2020-07-16 20:27:42 +02:00
Knut Sveidqvist da8e75f98a Merge from master with doc updates 2020-07-16 12:27:03 +02:00
Knut Sveidqvist 594ae20a6e #1547 Remove usage of crypto libraries 2020-07-16 10:48:37 +02:00
Knut Sveidqvist 6959e140af #1485 Fixing font in pie legends after fix 2020-07-15 12:32:43 +02:00