GitHub/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-01-14 06:43:25 +08:00
Code Issues Projects Releases Wiki Activity
2,688 Commits 182 Branches 159 Tags
Commit Graph

938 Commits

Author SHA1 Message Date
chris moran
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
chris moran
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
chris moran
cbb69bd3cb
() => is not the same as function() {} smh 
Fixed a few of the text rendering issues
 2020-07-01 04:34:29 -04:00
chris moran
174b098724
loop/opt/alt/etc titles should always wrap 2020-06-30 07:54:51 -04:00
chris moran
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
chris moran
5b37536ce5
math is hard sometimes? 2020-06-30 06:42:29 -04:00
chris moran
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
chris moran
fed142dad2
Merge branch 'mermaid-js-develop' into develop 2020-06-30 03:34:55 -04:00
chris moran
fcd2126330
Getting closer 2020-06-28 08:37:26 -04:00
chris moran
6915634729
Missed activationWidth new configuration option for sequence diagrams 2020-06-26 10:17:13 -04: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
Ashish Jain
1e400624e0 Adjusting classDiagram marker styling 2020-06-24 21:46:59 +02:00
Knut Sveidqvist
b9931da241 1465 Marking edges witrh new schema for arrow heads 2020-06-24 19:47:12 +02:00
Knut Sveidqvist
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
Knut Sveidqvist
832206ef80 Adjust flowchart-v2 to use new arrot type handling 2020-06-24 19:42:56 +02:00
Ashish Jain
85d4f2843e Initial commit for classDiagram v2 2020-06-24 19:34:12 +02:00
Knut Sveidqvist
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
abhijeet-pathak
3c727bc46f
Corrected the test case description 2020-06-24 14:51:08 +05:30
Miika Kankare
955ccfae88 Make gitGraph commit IDs out of hexadecimal chars 2020-06-24 09:28:58 +03:00
Abhijeet Pathak
2840c98bb0 Added test case for preserving creation order 
of tasks
 2020-06-23 22:32:49 +05:30
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
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
Abhijeet Pathak
e515c7beb1 Fxed liniting issues. 2020-06-20 18:39:19 +05:30
Abhijeet Pathak
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
zwPapEr
c00b204259 gitGraph: 🔨 dot and minus should be valid branch name 2020-06-20 11:58:38 +08:00
Chris Moran
809ba2b392
Fixed: width of notes left of and right of 2020-06-19 13:50:53 -04:00
Chris Moran
18254392ab
Merge branch 'mermaid-js-develop' into develop 2020-06-19 13:32:23 -04:00
Chris Moran
5646518352
Tweaked the PR for long messages 2020-06-19 12:45:04 -04:00
Chris Moran
710b88efae
Merge branch 'feature/1483_long_messages' of https://github.com/mermaid-js/mermaid into develop 2020-06-19 09:17:04 -04:00
Chris Moran
1118c3399c
Fixed incorrect positioning and bounds for actors and notes with wrapping enabled and disabled 2020-06-19 09:13:37 -04:00
Knut Sveidqvist
44d5009538 Revert of PR #1482 2020-06-19 10:52:20 +02:00
Knut Sveidqvist
dbbfbb2855 Updates after review 2020-06-19 08:40:54 +02:00
Chris Moran
24ed979faf
Fixed an incorrect reference to an outer variable (actor) when processing actor widths 2020-06-18 08:51:16 -04: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
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
bd0210cdce 1473 Updated config handling 2020-06-15 01:11:56 +02: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
Knut Sveidqvist
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
Chris Moran
620c894929
Fixed issue causing idea-multimarkdown headaches: util changes. Reworking them. 2020-06-14 06:53:22 -04:00
Knut Sveidqvist
cc9c69c931 #1466 Fixing notes for state diagrams (beta) 2020-06-13 13:44:45 +02:00
Knut Sveidqvist
6559cfd0e1 #1466 Handling line styles using the new rendering engine 2020-06-13 13:12:33 +02:00
Toan
28dcc781b4 Chart Node click event support key-path value for function callback 2020-06-13 17:41:52 +07: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
44675739a1 when window scroll, the tooltip show incorrect position coz its missing offset of window.scrollXY 2020-06-11 16:01:36 +07:00
Toan
6e13718cbd naming the link/connector edgeLabel and edgePath to let easy query and custom. 2020-06-11 11:42:14 +07:00
Justin Greywolf
67e167427c 1378-Added additional test 2020-06-09 14:54:08 -07:00
Justin Greywolf
969a4e7ba5 1378-refine legacy member parsing to cover additional cases 2020-06-09 14:25:03 -07:00