marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-09-21 08:19:43 +02:00
Code Issues Packages Projects Releases Wiki Activity
13,546 Commits 209 Branches 187 Tags
9c85521e168f2dc9109c317df8d41f5a8ded21a6
Commit Graph

70 Commits

Author SHA1 Message Date
darshanr0107
4937ebc058 Merge branch 'develop' of https://github.com/mermaid-js/mermaid into knsv/mindmap-refactoring 2025-08-26 15:01:48 +05:30
Knut Sveidqvist
b9ef683fb6 #6856 Exposing elk configuration forceNodeModelOrder and considerModelOrder to the mermaid configuration 2025-08-14 12:56:20 +02:00
anderium
4f24489d81 Make elk not force model order, but strongly consider it instead 
This improves the ordering in models with crossings that can be resolved by reordering nodes. It keeps the node order to still avoid #6647 which cause this regression to be introduced.

[See this example on the ELK Editor.](https://rtsys.informatik.uni-kiel.de/elklive/elkgraph.html?compressedContent=IYGw5g9gTglgLgCwLYC4AEJgE8CmUcAmAUAPQloDGUEAzjTAHZgCyjMSMAXsHDBAwDoAZtAo4AchAI5mUnCADyUaVHRwoAVxxEK-eitnTFyvAJrqeOMFnTiFAEQCiAZQD6AQXH3Xj+wHEXIlJyABUEGBo0CLQAI2ACNAB3BBwGNA16JjQRKDFJaUN5JRU1TRwBIIY5NAYABjQAbwxgGPk0ACJa9rQAXyIq6Rr3RubWkA7gbr6BnBqARhHMMY65qf7qhgAmRZa29s21mZqADR3l9uPDjYAhM72Yq8GGa+GmpfuBVd71p+vbt9243aMQEB2+R2epwB5wAWmsiIQwLM6mgALQAPiGaARBCRNXqGPmQURyIWhK2xNxyOG5OulLxzzRmOe7hxDNutLpbORLyZNWux25-I5zMFQq2fIYYuCaGuGjgaEQ0RoCAgGhACVaaAA1jgAA4KxCzGjAJDlGUASQV+GgKkicAgaAAzAAaNAAFjdczd2xgQkoehgBjkxhUZgscCsNjQdnEjjQAAppEJgOq4ABKSrVABu9Whe1zj1m2YW+aBJaLaGz2zLHWrlezTru5adDfdzbr7vhJKrBMxJaFub51cHfarTtHw-dRCAA)
 2025-08-13 01:47:25 +02:00
darshanr0107
1507435e15 chore: remove unwanted logs 
on-behalf-of: @Mermaid-Chart <hello@mermaidchart.com>
 2025-08-11 13:51:10 +05:30
darshanr0107
5db83365b6 Merge branch 'develop' of https://github.com/mermaid-js/mermaid into knsv/mindmap-refactoring 2025-07-30 14:59:39 +05:30
Knut Sveidqvist
e682172823 Reverting the elk.layered.wrapping.validify.strategy setting 2025-06-11 17:06:17 +02:00
Knut Sveidqvist
85c5b9b4c0 #6647 Make elk respect the order of nodes based from the code 2025-06-11 17:00:29 +02:00
Knut Sveidqvist
e7208622f7 Merge branch '6088-fix-for-diamond-intersections 2025-06-06 20:14:02 +02:00
Knut Sveidqvist
f2eef37599 Updated renderinig flow for mindmaps 2025-06-06 11:20:31 +02:00
Josh Soref
8fed1c86b0 spelling: on 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2025-04-17 17:38:54 -04:00
Josh Soref
c81f63b462 spelling: id 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2025-04-17 17:38:54 -04:00
Josh Soref
5919d39812 spelling: and 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2025-04-17 17:38:53 -04:00
Knut Sveidqvist
1e3ea13323 Fix for when last point is on the intersection 2024-11-29 09:07:47 +01:00
Knut Sveidqvist
4c8c48cde9 Generic solution for intersection of shapes with elk 2024-11-28 14:31:54 +01:00
Knut Sveidqvist
1e672868c4 #6088 Updated offset calculations 2024-11-27 17:05:58 +01:00
Knut Sveidqvist
1e6419a63f #6088 Updated offset calculations 2024-11-27 15:52:24 +01:00
Knut Sveidqvist
c7ae08abc3 #6080: Fix for issue with diamond intersections when using elk-layout 2024-11-25 17:15:35 +01:00
Knut Sveidqvist
d3b2c7ea18 Revert "#6080: Fix for issue with diamond intersections when using elk-layout" 
This reverts commit 255279eb22.
 2024-11-25 17:10:25 +01:00
Knut Sveidqvist
255279eb22 #6080: Fix for issue with diamond intersections when using elk-layout 2024-11-25 16:50:16 +01:00
yari-dewalt
b315d70af5 Merge branch 'develop' into update-class-diagram and fix conflicts 2024-10-28 10:32:19 -07:00
yari-dewalt
fd6b875f87 Fix subgraph / cluster node width based off of label 2024-10-21 16:09:55 -07:00
Alois Klink
6cc0132e0a refactor(elk): add LabelData type for layout-elk 
I don't know what exactly the type does or is for, but I've tried to
type it to what it seems to be.
 2024-10-21 22:23:36 +09:00
Alois Klink
4bc70b7325 refactor: use more standard types 
See: https://github.com/mermaid-js/mermaid/pull/5974#discussion_r1806473749
See: https://github.com/mermaid-js/mermaid/pull/5974#discussion_r1808511738

Co-authored-by: saurabhg772244 <saurabh@mermaidchart.com>
 2024-10-21 22:23:36 +09:00
Alois Klink
16a5fc05d6 refactor: remove some any types from render() 
This let's us confirm that the types we're passing to `insertNode()` are
valid.
 2024-10-18 01:51:53 +09:00
yari-dewalt
6041729ae2 Add suport for start and end labels (cardinality) in elk renderer 2024-10-17 08:58:06 -07:00
saurabhg772244
be9123ee2b Updated renderOptions to add direction property 2024-09-18 13:10:07 +05:30
saurabhg772244
8456d7b100 Updated insertNode to pass optional config 2024-09-13 14:11:13 +05:30
Nicholas Bollweg
6a97f80cc3 add another maybe-undefined operator elk 2024-08-30 09:16:38 -05:00
Nicholas Bollweg
a45588ce7c Merge remote-tracking branch 'upstream/develop' into gh-5747-rendering-util-types 2024-08-30 08:54:05 -05:00
Nicholas Bollweg
59d6f04e4b make rendering-util/types a real ts file 2024-08-30 08:38:41 -05:00
Knut Sveidqvist
9cf562476a Tweaking the elk config and exposing elk.layered.cycleBreaking.strategy to mermaid configuration 2024-08-26 15:34:14 +02:00
Sidharth Vinod
0a0546e241 chore: Fix build issue 2024-08-22 15:00:53 +05:30
Knut Sveidqvist
47ac57be69 Removing the redundant element in the render function 2024-08-22 10:11:13 +02:00
Knut Sveidqvist
9134e1c837 #5237 Clean and fix for issue with edges to the diamond shape 2024-08-21 16:11:59 +02:00
Knut Sveidqvist
10c25348f3 #5237 Removing unused code 2024-08-21 14:42:44 +02:00
Sidharth Vinod
3593fa63db fix: Type of render 
Make optional parameter an object
 2024-08-21 17:41:11 +05:30
Sidharth Vinod
f6e1515f66 feat: Inject internal helpers into render function 2024-08-21 17:22:21 +05:30
Sidharth Vinod
c5be9fd882 chore: Move render function to bottom 2024-08-21 17:12:59 +05:30
Sidharth Vinod
01b5935a4e chore: ts-ignore errors 2024-08-21 17:12:03 +05:30
autofix-ci[bot]
ed07a9e896 [autofix.ci] apply automated fixes 2024-08-21 09:12:02 +00:00
Sidharth Vinod
4e126e174b chore: Cleanup layoutelk 2024-08-21 14:17:06 +05:30
Knut Sveidqvist
61cc2fc215 #5237 Fix for issue with edge routing for elk layout 2024-08-05 12:59:10 +02:00
Knut Sveidqvist
c4ce8543d3 5237 Fix for edges to diamond shapes 2024-07-31 15:03:25 +02:00
Ashish Jain
2800f555c7 fix lint issue 2024-07-19 14:12:19 +02:00
Knut Sveidqvist
2718cdae51 #5237 Fix for issues generated by linkting/cleanup 2024-07-19 12:19:27 +02:00
Knut Sveidqvist
d96dcd2529 #5237 Updated configuration schema for elk layout 2024-07-19 11:53:15 +02:00
Ashish Jain
8950fb1795 fix: lint & build issue 2024-07-15 11:48:46 +02:00
Ashish Jain
7a45ed8733 fix: lint issue 2024-07-12 09:55:42 +02:00
Sidharth Vinod
03a634607a Merge branch '5237-unified-layout-common-renderer' into sidv/5237_Cleanup 
* 5237-unified-layout-common-renderer:
  #5237 Fix fir subgraphs with elk
  #5237 Fix for diamond intersections with ELK, tweak
  #5237 Fix for diamond intersections with ELK
  fix for note with a composite state
  #5237 Handling of subgraphs using elk
  #5237 Handling of subgraphs using elk
  Fix fro direction in layout data
 2024-07-04 12:47:57 +05:30
Knut Sveidqvist
6b7d78ebcf #5237 Fix fir subgraphs with elk 2024-07-03 15:47:33 +02:00