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
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
dba579b546
#1542 Gantt tweaks
2020-07-20 10:24:15 +02:00
fa68b8bb35
#1542 Some tweaks for sequence diagram
2020-07-20 10:05:46 +02:00
ceb84ce020
#1542 Dark theme fixes for gantt
2020-07-20 10:00:08 +02:00
68aa7fa3a4
#1542 Dark theme fixes for pie and user-journey
2020-07-20 09:44:09 +02:00
70cd0655ed
#1542 Set default theme variables
2020-07-20 08:20:09 +02:00
3c23de9735
#1542 Lint fixes
2020-07-19 21:15:58 +02:00
91da46dd63
#1542 Theme adjustments
2020-07-19 21:10:52 +02:00
4d280ff010
#1542 Making sure user overrides from directives ocerrides properly
2020-07-19 15:02:53 +02:00
04493035cd
#1542 Adding khroma for color in dark-theme
2020-07-18 15:51:17 +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
26dba53d99
Update config.js
2020-07-18 04:39:33 -07:00
f7a6241ac0
#1542 Fix for markers in class diagrams
2020-07-18 09:57:55 +02:00
b6453383cf
#1542 Handling of default values when no theme is set
2020-07-18 09:37:51 +02:00
8d076efd71
#1542 Styling for all diagram types
2020-07-17 15:57:02 +02:00
f9667cd80f
#1542 Test page using directoives to switch theme
2020-07-17 12:34:33 +02:00
030b945828
#1542 Theme variables setup
2020-07-17 09:16:39 +02:00
fd4240b774
#1542 Setting theme options as the regular options
2020-07-16 23:39:38 +02:00
8c0e022b44
Template for dynamic styles in place
2020-07-16 20:27:42 +02:00
da8e75f98a
Merge from master with doc updates
2020-07-16 12:27:03 +02:00
594ae20a6e
#1547 Remove usage of crypto libraries
2020-07-16 10:48:37 +02:00
6959e140af
#1485 Fixing font in pie legends after fix
2020-07-15 12:32:43 +02:00
3a9306a9c2
#1485 Setting proper font settings in the root css
2020-07-15 12:12:57 +02:00
9a2321a669
Update config.js
2020-07-14 18:15:42 -07:00
1878e39dfc
Update config.js
2020-07-14 18:11:36 -07:00
686ee1e349
Relase 8.6.0
2020-07-13 16:39:52 +02:00
2bdc229a9a
Merge pull request #1496 from polarsquad/fix-git-commit-id
...
Make gitGraph commit IDs out of hexadecimal chars
2020-07-12 11:22:19 +02:00
e93a0556e7
Merge pull request #1471 from vantoan8x/securityLevel_antiscript_option
...
add security level antiscript option, use rich html format but dont permit script element.
2020-07-12 10:58:08 +02:00
12668b78b9
Merge pull request #1535 from 72636c/feature/er_classes
...
Add classes to ERD elements
2020-07-12 10:52:30 +02:00
8255088508
Merge pull request #1534 from 72636c/feature/er_use_max_width
...
Add `er.useMaxWidth` config option
2020-07-12 10:51:00 +02:00
3e38da2120
Document er defaults
2020-07-11 20:50:36 +10:00
20e56d7dfa
Add classes to ERD elements
...
It's a little hard to style the current ERDs. This aims to make things
easier by associating a distinct class with each type of element within
the diagram.
I've added a common `er` class across the elements so that those that
bring their own `themeCSS` can target styles at this diagram type. This
hasn't really been done elsewhere so I'm open to suggestions; an
alternative may be to add classes to a top-level element so that we can
do e.g. `svg.mermaid.er .entityBox`.
2020-07-11 20:34:57 +10:00
99cb752c71
Add `er.useMaxWidth` config option
...
This restores the option of rendering an ERD with an absolute width,
which is consistent with the approach taken with the other diagram
types.
This logic was lost in #1324 , which was probably just a small oversight:
9199546dca (diff-7c38d27acbe0676d923bf19283671616L397-L409)
2020-07-11 18:54:26 +10: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
dee47ec978
Missed test case for allowing site owner to append to `secure` field set
...
Missed logic for default-appending src array values where not existing within dst array in assignWithDepth function
2020-07-08 08:41:35 -04:00
fce2a16e42
add security level antiscript option, to let use rich html format but remove all script element.
2020-07-05 23:04:22 +07:00
5242672efb
Adding configuration docs to setup.md and bumping version to 8.6.0
2020-07-04 14:25:14 +02:00
19ed03c44c
#1524 Updated tests
2020-07-04 12:35:34 +02:00
32b2ee8cab
2020-07-04 11:13:54 +02:00
7e9ab546eb
Fix for broken build, issue with config use in flowcahart and gantt diagram
2020-07-02 22:34:13 +02:00
2af1f9a9d3
Fix for broken build, issue with config use in flowcahart and gantt diagram
2020-07-02 22:27:03 +02:00
c655cfaca8
Merge branch 'develop' into feature/1483_long_messages
2020-07-02 18:38:37 +02:00
b3a465dbca
Merge branch 'develop' into feature/1483_long_messages
2020-07-02 18:25:49 +02:00
33d3bc53b4
Merge pull request #1519 from cmmoran/develop
...
Utils - memoize, calculateTextDimensions (and friends), assignWithDepth, etc
2020-07-02 17:01:24 +02:00
faac22f6ed
Lint fix
2020-07-02 16:56:30 +02:00
01a2d90e38
sequence numbers for dark mode should probably be black since the circle is the contrast color
2020-07-01 07:53:03 -04:00
ca86ab71f2
added hasBreaks and splitBreaks to common.js
...
updated parseMessage to set wrap: true when breaks are detected
2020-07-01 07:41:44 -04:00
1c3c2b6a74
utils refactor
...
- memoize to poor-man-cache properly-ish
- wrapLabel, calculateTextDimensions (and friends) moved to utils for all to enjoy
- drawSimpleText getTextObj moved to utils to support the functions listed above
- assignWithDepth - Object.assign but depth-ier
- random - for crypto random numbers
2020-07-01 06:20:53 -04:00
2ffb2988bf
One small refactor to fix activation starty
...
Ensure a minimum amount of space between wrapped / non-wrapped title text and the next element
2020-07-01 05:34:53 -04:00
891b362e7d
Update mermaidAPI.js
...
-Added tables into the comments from mermaidAPI.md, to reflect documentation that I had added through a previous PR, #1509
-as per @knsv 's directions, added comments here.
-also found a list of parameters, who's documentation do not come out in the markdown file. I left them alone, but will be raising a separate issue, for others to review.
2020-07-01 01:35:25 -07:00
cbb69bd3cb
() => is not the same as function() {} smh
...
Fixed a few of the text rendering issues
2020-07-01 04:34:29 -04:00
174b098724
loop/opt/alt/etc titles should always wrap
2020-06-30 07:54:51 -04:00
6c6f6838ee
conf.messageFont() would have a different cacheKey based on the cacheKey calculations done in this particular branch. This will be normalized with the memoize PR about to be created.
2020-06-30 07:18:28 -04:00
5b37536ce5
math is hard sometimes?
2020-06-30 06:42:29 -04:00
d42b95bab9
messageFont, noteFont, and actorFont getConfig() calls were not specifying the sequence object
...
take into account width of message over single actor for actors' max message width
2020-06-30 06:20:45 -04:00
fed142dad2
Merge branch 'mermaid-js-develop' into develop
2020-06-30 03:34:55 -04:00
fcd2126330
Getting closer
2020-06-28 08:37:26 -04:00
6915634729
Missed `activationWidth` new configuration option for sequence diagrams
2020-06-26 10:17:13 -04: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
1e400624e0
Adjusting classDiagram marker styling
2020-06-24 21:46:59 +02:00
b190a0eaba
Added support for classDiagram relation arrow markers
2020-06-24 21:45:19 +02:00
b9931da241
1465 Marking edges witrh new schema for arrow heads
2020-06-24 19:47:12 +02:00
eaf0d5e0a0
Merge branch 'feature/Issue-1465_Class_migration' of github.com:mermaid-js/mermaid into feature/Issue-1465_Class_migration
2020-06-24 19:43:00 +02:00
832206ef80
Adjust flowchart-v2 to use new arrot type handling
2020-06-24 19:42:56 +02:00
85d4f2843e
Initial commit for classDiagram v2
2020-06-24 19:34:12 +02:00
0849aa3f03
Merge pull request #1488 from abhijeet-pathak/1005_gantt_sequnce_creation_order_change
...
Fix for the issue 1005
2020-06-24 18:33:01 +02:00
3c727bc46f
Corrected the test case description
2020-06-24 14:51:08 +05:30
955ccfae88
Make gitGraph commit IDs out of hexadecimal chars
2020-06-24 09:28:58 +03:00
2840c98bb0
Added test case for preserving creation order
...
of tasks
2020-06-23 22:32:49 +05:30
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
ee109c2279
noteModel generated during calculation of loop bounds
...
msgModel generated during calculation of loop bounds
simplifies draw messages loop
2020-06-20 18:15:24 -04:00
e515c7beb1
Fxed liniting issues.
2020-06-20 18:39:19 +05:30
5f56db6f6e
Fix for the issue 1005
...
(https://github.com/mermaid-js/mermaid/issues/1005 )
A new attribute 'order' has been introduced in the task which records
the serial number of task in the script.
In ganttRenderer.js, the tasks are sorted by stratTime attribute.
The function which calculates 'y' for task rectangles, lables etc.
has been modified to correctly position it.
2020-06-20 18:03:48 +05:30
c00b204259
gitGraph: 🔨 dot and minus should be valid branch name
2020-06-20 11:58:38 +08:00
809ba2b392
Fixed: width of notes left of and right of
2020-06-19 13:50:53 -04:00
18254392ab
Merge branch 'mermaid-js-develop' into develop
2020-06-19 13:32:23 -04:00
5646518352
Tweaked the PR for long messages
2020-06-19 12:45:04 -04:00
710b88efae
Merge branch 'feature/1483_long_messages' of https://github.com/mermaid-js/mermaid into develop
2020-06-19 09:17:04 -04:00
1118c3399c
Fixed incorrect positioning and bounds for actors and notes with wrapping enabled and disabled
2020-06-19 09:13:37 -04:00
b3f9bbe50f
Merge branch 'develop' into 1474_missplaced_transitions
2020-06-19 11:38:30 +02: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
dbbfbb2855
Updates after review
2020-06-19 08:40:54 +02:00
24ed979faf
Fixed an incorrect reference to an outer variable (actor) when processing actor widths
2020-06-18 08:51:16 -04: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
60586d8ce0
#1474 Lint changes
2020-06-17 18:31:53 +02:00
c95257f32c
#1474 Adding some tests
2020-06-17 18:28:49 +02:00
f0162557c5
#1474 Handling transitions
2020-06-17 18:16:24 +02: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
a251029546
#§473 Font update for e2e tests
2020-06-15 22:42:33 +02: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
08dd2bd93d
1473 Class diagrams
2020-06-15 08:03:13 +02:00
10b8a33b55
1473 Updated config handling, removed a logger
2020-06-15 01:12:25 +02:00
bd0210cdce
1473 Updated config handling
2020-06-15 01:11:56 +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
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
6309dd1350
Merge branch 'develop' of https://github.com/mermaid-js/mermaid into mermaid-js-develop
2020-06-14 11:40:15 -04:00
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
bb8efadb98
Merge pull request #1470 from vantoan8x/click_event_support_keypath_function
...
Chart Node click event support key-path value for function callback
2020-06-14 14:25:46 +02:00
620c894929
Fixed issue causing idea-multimarkdown headaches: util changes. Reworking them.
2020-06-14 06:53:22 -04:00
cc9c69c931
#1466 Fixing notes for state diagrams (beta)
2020-06-13 13:44:45 +02:00
6559cfd0e1
#1466 Handling line styles using the new rendering engine
2020-06-13 13:12:33 +02:00
28dcc781b4
Chart Node click event support key-path value for function callback
2020-06-13 17:41:52 +07:00
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
44675739a1
when window scroll, the tooltip show incorrect position coz its missing offset of window.scrollXY
2020-06-11 16:01:36 +07:00
6e13718cbd
naming the link/connector edgeLabel and edgePath to let easy query and custom.
2020-06-11 11:42:14 +07:00
67e167427c
1378-Added additional test
2020-06-09 14:54:08 -07:00
969a4e7ba5
1378-refine legacy member parsing to cover additional cases
2020-06-09 14:25:03 -07:00
0495103635
Fix regex and Fix incorrect test
2020-06-08 19:21:33 -07:00
9091d686ed
1378-Update regex to match multiple parameters
...
removing node version changes
2020-06-08 18:42:29 -07:00
47b5d7a2df
1378-accept multiple parameters with methods
...
sec
2020-06-08 18:42:29 -07:00
4a253a7760
Merged with mainline develop
2020-06-08 14:58:42 -04:00
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
db3377e170
Lint fixes
2020-06-06 12:53:19 +02:00
85a8feec9d
Also fix for error handling when setting mermaid.parseError
2020-06-06 12:42:35 +02:00
b76e833ea5
#1436 Correcting intersection calculations for circles
2020-05-30 18:04:46 +02:00
3bdb9f289f
Merge branch 'master' into develop
2020-05-30 17:11:23 +02:00
8958b2aa1b
Merge pull request #1432 from mermaid-js/1418_html_labels_rendering_engine
...
1418 html labels rendering engine
2020-05-27 22:34:26 +02:00
cf0fb69153
#1418 Lint fixes
2020-05-27 22:23:53 +02:00
8603cf89b0
#1418 Fix for descriptions in states
2020-05-27 22:18:59 +02:00
39ef0107ad
#1418 Fix for titles in stateDiagram clusters
2020-05-27 21:47:07 +02:00
63d7b63f42
#1418 Fix fr background in notes when using htmlLabels
2020-05-27 21:20:18 +02:00
4ea6c98f43
#1418 Adding support for htmlLabels in stateDiagram (v2)
2020-05-27 20:41:59 +02:00
39bdf261c6
2020-05-27 19:38:30 +02:00
7a7e8fe741
Merge pull request #1425 from spopida/bug/1415_erd_empty_label_not_working
...
Ensure empty quoted relationship labels are accepted in ER diagrams
2020-05-27 19:30:21 +02:00
f1c05bc909
Ensure empty quoted relationship labels are accepted in ER diagrams
2020-05-23 13:33:44 +01:00
ef24020b14
Merge pull request #1411 from ivan-danilov/sequence-over-notes-position-fix
...
Fixed SequenceDiagram over note horizontal position
2020-05-22 09:33:54 +02:00
9da027cf74
Fix for intersect issues for start/end state
2020-05-17 09:34:56 +02:00
45e9988700
Lint fix
2020-05-16 21:59:13 +02:00
c21b61bbd2
Bug fixes in new functionality, intersections not taken into account in nodes used by new graph engine. Graph flowchart not usable when integrating using mermaid.core. Incorrect flwochart docs
2020-05-16 19:58:22 +02:00
61249b0887
Fixed SequenceDiagram over note horizontal position
...
Previous expression with noteWidth does not make sense as noteWidth is
not used in case of note over two participants - forceWidth is used
instead. It tried to be symmetrical over cases A,B and B,A but failed.
Can be seen with messages over conf.width size (cannot reproduce in the
live editor as it seems to use not the last version where the code
does not use noteWidth).
The changed code explicitly calculates which of the actors is the
"left" one and starts rendering half margin to the left of its cetral
line.
2020-05-13 21:50:25 -07:00
7b15fefcaa
#1408 Mocking new module in tests
2020-05-13 19:21:53 +02:00
6d076284e8
#1408 Removing crypto-random-string and he
2020-05-13 19:14:18 +02:00
d7d248fd04
Merge pull request #1388 from mermaid-js/1386_finetuning_rendering_engine
...
1386 finetuning rendering engine
2020-05-13 17:36:12 +02:00
1fc6603f41
Merge branch 'develop' into feature/remove-lodash
2020-05-13 17:34:26 +02:00
053a86c0d4
Do explicit imports for d3 instead of wildcards
2020-05-11 07:10:04 +01:00
28ea68fe7f
Replace lodash with specific implementations, #1389
2020-05-07 21:35:34 +08:00
9a3ec31191
#1386 Adding support for click events and links
2020-05-06 18:51:12 +02:00
a20e6086cc
#1386 Adding subroutine support for new rendering engine
2020-05-03 21:52:44 +02:00
a8f9e3f0b0
#1386 Adding some docs and adjusted sizing for state diagrams
2020-05-03 13:31:09 +02:00
67aed51742
#1382 Fix for lost parentage for nodes in deep structure
2020-05-01 19:18:07 +02:00
d068a460bd
Change ERD fontSize config to an integer to prevent NaN errors
2020-04-30 15:55:14 +01:00
0933268e61
Merge pull request #1371 from jgreywolf/1234-RefactorClassDiagramScaling
...
1234 refactor class diagram scaling
2020-04-26 17:23:14 +02:00
Knut Sveidqvist