marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-12-03 02:54:06 +01:00
Code Issues Packages Projects Releases Wiki Activity
12,054 Commits 233 Branches 192 Tags
32ff6ec50fbd286e2867c7c14235220f7d345769
Commit Graph

12054 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alois Klink
32ff6ec50f Export calcIntersections, calcNodeIntersections 
Support doing:

```js
import { calcIntersections, calcNodeIntersections } from '@mermaid-chart/mermaid';
```

This means we can eventually stop doing `window.calcIntersections` and
`window.calcNodeIntersections`.
 2024-10-04 19:57:35 +09:00
Ashish Jain
0198f0e798 Update alana version 2024-10-03 15:42:48 +02:00
Knut Sveidqvist
9aded56538 Updating image and diamond dimension handling 2024-10-03 15:32:07 +02:00
Knut Sveidqvist
b52b54086e Fixed sizing of diamond shape 2024-10-03 07:59:55 +02:00
Ashish Jain
31c01b1795 fix for label positioning for brace-l & brace-r shapes 2024-10-02 21:33:44 +02:00
Ashish Jain
90b200ed2e Merge commit 2024-10-02 21:22:58 +02:00
Ashish Jain
971a166073 fix for label positioning for brances shape 2024-10-02 21:22:01 +02:00
Knut Sveidqvist
4e25bf5db9 Adding handling of self-loops into update position 2024-10-02 21:06:01 +02:00
Ashish Jain
962fcb8ba8 fix for label positioning divided rect 2024-10-02 20:59:21 +02:00
Knut Sveidqvist
b3f2ba8bb8 Fix for intersecrtion calculations for start shape sm-circ 2024-10-02 20:36:10 +02:00
Ashish Jain
bda37516b8 fix for label positioning triangle and flipped triangle 2024-10-02 19:43:54 +02:00
Ashish Jain
0aebb941e9 Updated alana version 2024-10-02 14:45:35 +02:00
Knut Sveidqvist
36df0e340e Merge branch 'neo-new-shapes' of github.com:Mermaid-Chart/alana-mermaid into neo-new-shapes 2024-10-02 14:37:03 +02:00
Ashish Jain
1d8c4fd279 merge from upstream 2024-10-02 14:36:41 +02:00
Knut Sveidqvist
c1377f9075 Adjusted fixed height settings odd 2024-10-02 14:36:19 +02:00
Sidharth Vinod
4cb0f87b72 Merge branch 'develop' into knsv/new-shapes 2024-10-02 17:50:41 +05:30
Ashish Jain
c6fd62ab7d fix for min size for flag 2024-10-02 14:07:45 +02:00
Ashish Jain
2abdece0f2 fix for min size for tagged rect 2024-10-02 13:34:28 +02:00
Ashish Jain
1e8cd63645 fix broken e2e for new & old shapes 2024-10-02 13:30:28 +02:00
Knut Sveidqvist
ed1427ed31 Adjusted fixed height settings tag-doc 2024-10-02 13:22:38 +02:00
Ashish Jain
3860a99951 limit the test cases for only two direction 2024-10-02 11:28:43 +02:00
Knut Sveidqvist
36f1dc8541 Merge branch 'neo-new-shapes' of github.com:Mermaid-Chart/alana-mermaid into neo-new-shapes 2024-10-02 09:47:22 +02:00
Knut Sveidqvist
7a7d161a61 Fix for tag-doc 2024-10-02 09:46:58 +02:00
Ashish Jain
a2d64a82c5 fix for min size for more shapes 2024-10-02 09:45:55 +02:00
Ashish Jain
f1674b8b04 fix for min size for more shapes 2024-10-01 23:45:32 +02:00
Ashish Jain
eb346e1c51 fix for min size for several shapes 2024-10-01 21:35:30 +02:00
Ashish Jain
d2dfb639c8 fix for min size for several shapes 2024-10-01 18:52:26 +02:00
Alois Klink
5363e9545e Merge 'aloisklink:fix/5904-ban-dompurify-3.1.7' into neo-new-shapes 
This prevents DOMPurify 3.1.7 from being installed.
 2024-10-02 00:27:19 +09:00
Sidharth Vinod
a5559c6588 Merge pull request #5914 from aloisklink/fix/5904-ban-dompurify-3.1.7 
fix: ban version v3.1.7 of DOMPurify
 2024-10-01 15:23:18 +00:00
Alois Klink
de2c05cd54 fix: ban version v3.1.7 of DOMPurify 
[DOMPurify v3.1.7][1] forbids the use of `<foreignElement>` for HTML
inside of an `<svg>` element, which breaks many mermaid diagrams.

It is likely that v3.1.8 will add a new option that will allow us to
re-enable this behaviour, but v3.1.7 definitely does not work.

[1]: https://github.com/cure53/DOMPurify/releases/tag/3.1.7

See: https://github.com/cure53/DOMPurify/issues/1002
Fix: https://github.com/mermaid-js/mermaid/issues/5904
 2024-10-02 00:02:52 +09:00
omkarht
6d916fb66f updated icon and image shape for htmlLabels center alignment 2024-10-01 19:38:18 +05:30
omkarht
42fd9836f0 updated curly-brace shapes 2024-10-01 18:56:29 +05:30
Knut Sveidqvist
bda3bfd2a7 test html file 2024-10-01 14:50:20 +02:00
Knut Sveidqvist
834fa07991 Updated shapes using the set width/height 2024-10-01 14:18:40 +02:00
Sidharth Vinod
90b6df24a1 Merge branch 'develop' into knsv/new-shapes 2024-10-01 12:59:55 +05:30
Knut Sveidqvist
491aa7d9ff Mermaid version v11.2.0-b.12 2024-09-30 15:04:25 +02:00
Knut Sveidqvist
6cf07067e2 Default size for circle 2024-09-30 14:57:14 +02:00
Knut Sveidqvist
d0881534c1 Merge branch 'neo-new-shapes' of github.com:Mermaid-Chart/alana-mermaid into neo-new-shapes 2024-09-30 14:54:40 +02:00
Knut Sveidqvist
f10d148097 Adjusted min values 2024-09-30 14:53:33 +02:00
Per Brolin
f5545d094f Set a smaller default size for stateStart and stateEnd 2024-09-30 13:16:44 +02:00
Per Brolin
c36bdf12a0 Merge branch 'perb-fix-circles-resize' into neo-new-shapes 2024-09-30 10:58:54 +02:00
Per Brolin
92f67af6af Merge branch 'neo-new-shapes' into perb-fix-circles-resize 2024-09-30 10:56:08 +02:00
Per Brolin
d175e9a403 Fixed default size if not provided in height/width 2024-09-30 10:48:15 +02:00
Per Brolin
2ce57e4cf4 Fix default size if width/height not provided 2024-09-30 10:45:52 +02:00
Per Brolin
a7a9185222 Fix default size if not provided 2024-09-30 10:44:01 +02:00
Per Brolin
edc2ac7fea Fixed double circle 2024-09-30 10:35:13 +02:00
Per Brolin
221d59cbfc Fix problem with circle 2024-09-30 10:26:00 +02:00
Knut Sveidqvist
e8472c3647 Merge branch 'neo-new-shapes' of github.com:Mermaid-Chart/alana-mermaid into neo-new-shapes 2024-09-30 10:16:38 +02:00
Knut Sveidqvist
414f666417 Better handling of subgraphs without positions 2024-09-30 10:11:38 +02:00
Per Brolin
5ad1a6082b Merge branch 'neo-new-shapes' into perb-fix-circles-resize 2024-09-29 22:45:46 +02:00