Sidharth Vinod
60ea9a2972
v10.6.2-rc.2
2023-12-04 12:20:40 +05:30
Sidharth Vinod
1165fb163d
Merge branch 'develop' into release/10.6.2
...
* develop: (47 commits)
chore(deps): update all minor dependencies
chore: Rename test
test: Add unit test for generic classname and namespace
Split type from generic class name
Referenced the PmWiki's Cookbook recipe enabling MermaidJs schematics in wiki pages
test(e2e): fix pie chart E2E tests for PR #4288
Add dummy commit to trigger GH checks
chore: Revert unnecessary export
refactor: Remove unnecessary calculations
chore: Fix computeWidth function
chore: Cleanup setupGraphViewbox
Update docs
update mermaidAPI to cleanup the text before passing to getDiagramFromText
Add test for subgraphs with title margins and edge labels
Modify margin logic to avoid creating unnecessary space in subgraph
review fixes
add test
remove unused variable
fix: clean comments in text in getDiagramFromText API so flowchart works well
chore(deps): update all minor dependencies
...
2023-12-04 12:20:17 +05:30
Sidharth Vinod
160c7d399a
fix : #5100 Add viewbox to sankey
2023-12-04 11:36:07 +05:30
renovate[bot]
e87243c135
chore(deps): update all minor dependencies
2023-12-04 06:04:52 +00:00
Sidharth Vinod
761fa27eea
chore: Rename test
2023-12-04 11:22:09 +05:30
Sidharth Vinod
93a920cdfe
test: Add unit test for generic classname and namespace
2023-12-04 11:21:27 +05:30
Sidharth Vinod
d22ee8d1d5
fix: Check if parentCommit is provided
2023-12-04 11:13:52 +05:30
Sidharth Vinod
f806de3a1d
Merge branch 'develop' into sidv/5042_maxEdges
2023-12-04 09:57:26 +05:30
Justin Greywolf
8de1bde8f4
Split type from generic class name
2023-12-03 18:01:00 -08:00
RounakJoshi09
31a1de1566
Condition of Parent Id Without Merge Commit Added
2023-12-04 00:28:01 +05:30
RounakJoshi09
c6bf9083c8
Merge branch 'develop' into bug/#4497_unable-to-cherrypick-merge-commit
2023-12-04 00:19:28 +05:30
futzmonitor
8e95cdb883
Changes to gantt.jison
...
1. Consistent spacing on line 30
2023-12-02 12:56:58 -05:00
futzmonitor
68ff352f2d
Changes to gantt.jison
...
1. Removed typo
2023-12-02 10:26:46 -05:00
futzmonitor
f02dfe60af
Changes to gnatt.jison
...
1. Removed the hash and semicolon symbols from the title regex to allow for their use.
2. Removed the hash and semicolon symbols from the section regex to allow for their use.
3. Removed the hash and semicolon symbols for the taskTxt regex to allow for their use. I did not remove the colon because the parser fails to recognize when the actual taskData begins if that distinctions isn't kept.
4. Removed the regex \#[^\n]* which skipped comments to fix some bugs with hash symbols in the taskTxt. I tested this changed by putting it back and using the comment to see if it was recognized as a comment, but I would receive a syntax error and the diagram would not be rendered. So, I think we can safely remove that line, BUT it would be best practice if someone else tested this change to ensure that this will not break anyone's Gantt diagrams.
2023-12-02 10:23:44 -05:00
Sidharth Vinod
9be9601927
chore: Update promo link
2023-12-01 12:04:30 +05:30
Sidharth Vinod
fdf9988af1
feat #5042 : Add `flowchart.maxEdges` config.
2023-11-28 19:07:10 +05:30
d-faure
ae7003aa39
Merge remote-tracking branch 'origin/develop' into PmWiki-integration
2023-11-28 14:01:30 +01:00
d-faure
f35fb3955d
Referenced the PmWiki's Cookbook recipe enabling MermaidJs schematics in wiki pages
2023-11-28 13:50:31 +01:00
Sidharth Vinod
4499926453
Merge pull request #5076 from ad1992/aakansha/bug/5075-fix-getDiagramFromText-api
...
fix: clean comments in text in getDiagramFromText API so flowchart works well
2023-11-28 12:02:57 +00:00
Sidharth Vinod
252a8a73b1
Merge pull request #5041 from mathbraga/feature/4935_subgraph-title-margin-config-option
...
Feature/4935 subgraph title margin config option
2023-11-28 12:02:03 +00:00
Sidharth Vinod
a1563c9f7d
docs: Holiday promo v2
2023-11-28 13:39:46 +05:30
Aakansha Doshi
4ed7b2be02
Add dummy commit to trigger GH checks
2023-11-28 12:05:52 +05:30
Sidharth Vinod
af9566df75
Update packages/mermaid/src/docs/.vitepress/components/TopBar.vue
2023-11-28 11:42:04 +05:30
Sidharth Vinod
89b392327a
chore: Revert unnecessary export
2023-11-28 11:34:58 +05:30
Sidharth Vinod
9c2dae92f8
refactor: Remove unnecessary calculations
2023-11-28 11:30:41 +05:30
Sidharth Vinod
403ac4b76b
chore: Fix computeWidth function
2023-11-28 10:39:34 +05:30
Sidharth Vinod
0620c6daf2
chore: Cleanup setupGraphViewbox
2023-11-28 10:34:58 +05:30
Sidharth Vinod
1f4e335f8d
Merge branch 'develop' into pr/iwestlin/4288
...
* develop: (596 commits)
chore(deps): update all minor dependencies
chore(deps): update all patch dependencies
fix: flowchart image without text
fix Types
chore: Update pnpm-lock
chore: Add tests for calculateDeltaAndAngle
fix : #5064 Handle case when line has only one point
reset the testTimeout to 5 seconds and change it directly in the test
update testTimeout from 5 seconds to 10 seconds
Update all patch dependencies
fix broken link
add latest blog post
Update all minor dependencies
Update all patch dependencies
Fix docs
Update packages/mermaid/src/docs/community/questions-and-suggestions.md
Update packages/mermaid/src/diagrams/class/classRenderer-v2.ts
update edge ids
draw top actors with lines first followed by messages
Bump GitHub workflow actions to latest versions
...
2023-11-28 10:34:18 +05:30
Aakansha Doshi
fe4485c55f
update mermaidAPI to cleanup the text before passing to getDiagramFromText
2023-11-28 09:05:00 +05:30
Matheus Braga
5718be50ee
Merge branch 'develop' into feature/4935_subgraph-title-margin-config-option
2023-11-27 22:17:32 -03:00
Matheus B
8e794e3af9
Merge branch 'feature/4935_subgraph-title-margin-config-option' of https://github.com/mathbraga/mermaid into feature/4935_subgraph-title-margin-config-option
2023-11-27 22:13:00 -03:00
Matheus B
a807a58a29
Modify margin logic to avoid creating unnecessary space in subgraph
2023-11-27 22:10:05 -03:00
Steph
8d53fa17da
update announcements page
2023-11-27 11:44:47 -08:00
Steph
c0b80df1cb
update announcement bar verbiage
2023-11-27 11:36:56 -08:00
Aakansha Doshi
d3d4948b3a
Merge branch 'develop' into aakansha/bug/5075-fix-getDiagramFromText-api
2023-11-27 19:51:33 +09:00
Aakansha Doshi
4dbfa2f0d3
review fixes
2023-11-27 16:11:25 +05:30
Alois Klink
25e9bb354e
Merge pull request #4837 from mermaid-js/refactor/unifyEdgeMarkers
...
refactor: Unify the edgeMarker adding logic
2023-11-27 10:07:42 +00:00
Sidharth Vinod
7ca76b02e1
Merge pull request #5063 from bonyuta0204/bug/4736_zero_size_image_flowchart
...
fix: flowchart image without text
2023-11-27 08:28:48 +00:00
Aakansha Doshi
282da45d0e
Merge branch 'develop' into aakansha/bug/5075-fix-getDiagramFromText-api
2023-11-27 17:04:39 +09:00
Aakansha Doshi
7e119381e8
add test
2023-11-27 13:33:01 +05:30
Aakansha Doshi
4a4d715270
remove unused variable
2023-11-27 13:25:13 +05:30
Aakansha Doshi
1d5378a4f2
fix: clean comments in text in getDiagramFromText API so flowchart works well
2023-11-27 13:19:31 +05:30
renovate[bot]
2cc4f23856
chore(deps): update all patch dependencies
2023-11-27 01:36:48 +00:00
Matheus B
ce875c9a33
Move getConfig() call out of recursiveRender to its parent caller
2023-11-26 18:18:31 -03:00
Matheus Braga
904be162a8
Merge branch 'develop' into feature/4935_subgraph-title-margin-config-option
2023-11-25 14:40:56 -03:00
Matheus B
3489fc49b9
Replace multiple calls of getConfig() for a single at top of the scope
2023-11-25 13:51:49 -03:00
Sidharth Vinod
65ee65b3ec
Merge pull request #4915 from Patronud/develop
...
prevent-inherited-lineheights-on-edgeterminal-4083
2023-11-25 10:33:46 +05:30
Yuta Nakamura
1ff7218558
fix: flowchart image without text
2023-11-24 21:35:50 +09:00
Sidharth Vinod
5b705cf94f
v10.6.2-rc.1
2023-11-24 14:11:49 +05:30
Sidharth Vinod
b5ba09500f
Merge branch 'develop' into refactor/unifyEdgeMarkers
2023-11-24 11:14:00 +05:30
Sidharth Vinod
7b0f6c1c74
fix Types
2023-11-24 10:44:18 +05:30
Sidharth Vinod
c0fcf4f3b1
Merge branch 'develop' into 5064_EdgeOffsetEdgeCase
...
* develop:
fix broken link
add latest blog post
fix linting
fix: set proper shiki theme for light and dark modes
fix: change shiki theme to github-light
add latest blog post
add latest blog post
2023-11-24 10:26:32 +05:30
Sidharth Vinod
55ce05fc75
chore: Add tests for calculateDeltaAndAngle
2023-11-24 10:25:50 +05:30
Ronid1
aaf9fd5f03
update and verify links
2023-11-23 20:44:35 -08:00
Ronid1
783becebf6
alphabetically order sub categories
2023-11-23 20:38:44 -08:00
Ronid1
3e098ab73b
sort links alphabetically
2023-11-23 20:38:44 -08:00
Sidharth Vinod
8f733c6b01
Merge branch 'master' into develop
...
* master:
fix broken link
add latest blog post
fix linting
fix: set proper shiki theme for light and dark modes
fix: change shiki theme to github-light
add latest blog post
add latest blog post
2023-11-24 09:46:21 +05:30
Sidharth Vinod
78e118c876
fix : #5064 Handle case when line has only one point
2023-11-24 09:42:21 +05:30
Omer Priel
9ae00ebcdb
reset the testTimeout to 5 seconds and change it directly in the test
2023-11-23 14:55:09 +02:00
Matheus Braga
997a3771f1
Merge branch 'develop' into feature/4935_subgraph-title-margin-config-option
2023-11-20 21:28:09 -03:00
Matheus B
d79671e04a
Resolve lint issue
2023-11-20 21:16:10 -03:00
Matheus B
a935380713
Merge branch 'feature/4935_subgraph-title-margin-config-option' of https://github.com/mathbraga/mermaid into feature/4935_subgraph-title-margin-config-option
2023-11-20 21:07:24 -03:00
Matheus B
d61bfde167
Replace string concat with string templates
2023-11-20 21:06:38 -03:00
Matheus B
fc3018e977
Move subgraph title margin tests to independent file
2023-11-20 20:55:43 -03:00
Matheus B
63c2d36232
Rename file and update imports
2023-11-20 20:49:00 -03:00
Matheus B
c0a43f5d5a
Change getSubGraphTitleMargins to accept config object as parameter
2023-11-20 20:40:30 -03:00
Matheus B
ad6c76116d
Modify getSubGraphTitleMargins to use null coalescing operator
2023-11-20 19:13:34 -03:00
Knut Sveidqvist
df858dc7b6
#3358 Adding arrows to syntax
2023-11-20 14:00:25 +01:00
renovate[bot]
3ba0fee406
Update all patch dependencies
2023-11-20 09:56:45 +00:00
Steph
cbc97dacdf
fix broken link
2023-11-19 20:39:18 -08:00
Steph
8405454a1a
add latest blog post
2023-11-19 20:32:20 -08:00
renovate[bot]
a1c0761ef9
Update all minor dependencies
2023-11-20 01:43:47 +00:00
Matheus Braga
42ac630304
Merge branch 'develop' into feature/4935_subgraph-title-margin-config-option
2023-11-17 21:41:27 -03:00
Matheus B
453c16d08e
Remove unnecessary code
2023-11-17 20:20:13 -03:00
RounakJoshi09
c19fa122af
Merge branch 'develop' into bug/#4497_unable-to-cherrypick-merge-commit
2023-11-17 11:28:20 +05:30
RounakJoshi09
aadf5339a4
Error Hash Removed
2023-11-17 09:51:03 +05:30
Sidharth Vinod
a47a9e400b
Merge branch 'develop' into refactor/unifyEdgeMarkers
2023-11-16 11:00:33 +05:30
Nikolay Rozhkov
52603d7acd
Merge branch 'develop' into bug/4912_gitgraph-merge-routing-colouring
2023-11-14 16:26:19 +03:00
Alois Klink
c56025ec3b
Merge pull request #5013 from SteffenLm/bug/5009_static_class_attribute_not_rendered
...
Fix - static class attributes are not rendered underlined
2023-11-14 09:44:35 +00:00
Sidharth Vinod
0c0f7a739e
Merge pull request #4934 from RounakJoshi09/bug/#3251_linkStyle-can't-specify-ids
...
bug/#3251_linkStyle-can't-specify-ids Fixed
2023-11-14 05:38:20 +00:00
Sidharth Vinod
5fdbf5d891
Merge pull request #5017 from ad1992/bug/4946-fix-svg-order-sequence-participant
...
fix: render the participants in same order as they are created
2023-11-14 05:29:35 +00:00
Nikolay Rozhkov
fb031ee11a
Merge branch 'develop' into bug/4912_gitgraph-merge-routing-colouring
2023-11-13 23:14:42 +03:00
Matheus B
56c3809b57
Add logic to add subgraph title margin on layout
2023-11-12 17:32:58 -03:00
Matheus B
8b0a5be6d9
Include subgraph margin into label positioning
2023-11-11 18:18:51 -03:00
Matheus B
52ed38719f
Fix nesting of getSubGraphTitleMargins test.
2023-11-10 21:35:58 -03:00
Matheus B
0bcd5d28e8
Create helper function for subgraph title margin fetching.
2023-11-10 21:30:09 -03:00
Matheus B
b134766647
Add subgraph title margin config options to schema.
2023-11-10 21:22:31 -03:00
Sidharth Vinod
b12b8a9278
Merge pull request #4952 from ajdamico/patch-1
...
add links to make it easier
2023-11-09 23:46:24 +05:30
Sidharth Vinod
3c13386e5d
Update packages/mermaid/src/docs/community/questions-and-suggestions.md
2023-11-09 23:44:35 +05:30
Sidharth Vinod
a177141962
Merge pull request #5028 from mermaid-js/3952-lexical-ids
...
3952 lexical ids
2023-11-09 18:04:38 +00:00
Justin Greywolf
0f2b941e2d
Update packages/mermaid/src/diagrams/class/classRenderer-v2.ts
...
Co-authored-by: Sidharth Vinod <sidharthv96@gmail.com>
2023-11-09 08:05:09 -08:00
Justin Greywolf
e8ad72a980
Merge branch 'develop' into 3952-lexical-ids
2023-11-09 07:03:40 -08:00
Justin Greywolf
a8fe640546
update edge ids
2023-11-09 06:57:51 -08:00
Aakansha Doshi
01bbcc597a
draw top actors with lines first followed by messages
2023-11-09 17:52:00 +05:30
Andreas Deininger
f47e920a97
Documentation: clarify sentence
2023-11-09 12:50:01 +01:00
Sidharth Vinod
1571b25d29
Merge pull request #4958 from csholmq/fix/tooltip
...
fix(tooltip): remove redundant scroll offset
2023-11-09 09:01:19 +00:00
Sidharth Vinod
4a92fc5c92
Fix lint
2023-11-09 14:20:06 +05:30
Sidharth Vinod
8d6317b49a
Merge branch 'develop' into pr/csholmq/4958
...
* develop: (21 commits)
Fix typo
fix typo
Add new Atlassian integrations
chore(deps): update all patch dependencies
chore: release v10.6.1
fix(flow): fix invalid ellipseText regex
review fixes
Update XYChart's nav link in the docs template
Update index.md
add comment for ts ignore
move decodeEntities to utils
review fixes
chore(deps): update all minor dependencies
chore: Point to correct changelog
add spec
fix: getMessageAPI so it considers entity codes
Update classDiagram.md
Chore: Typo fixed in multiple files
feat(gantt): update styles
docs(integrations): add Mermaid for Slack
...
2023-11-09 14:19:28 +05:30
Sidharth Vinod
ee49c4b660
Merge pull request #4933 from REVERB283/bug/4716_fix_target_blank_getting_sanitized
...
fix: target blank removed from anchor tag
2023-11-09 08:46:33 +00:00
Sidharth Vinod
72038a68a9
Fix typo
2023-11-09 14:06:58 +05:30
Sidharth Vinod
051260e9a8
Merge branch 'develop' of https://github.com/mermaid-js/mermaid into develop
...
* 'develop' of https://github.com/mermaid-js/mermaid :
docs: fixed typo
2023-11-09 14:04:33 +05:30
Sidharth Vinod
3cf0a2b290
Merge pull request #4893 from 0xflotus/patch-1
...
docs: fixed typo
2023-11-09 14:04:17 +05:30
Sidharth Vinod
adfb60e045
fix typo
2023-11-09 14:03:38 +05:30
Sidharth Vinod
79bae62ce0
Merge pull request #4973 from SahilNagpure07/patch-1
...
docs: Update classDiagram.md
2023-11-09 13:57:36 +05:30
Sidharth Vinod
3038ce5864
Merge pull request #5021 from nashtechlabs/docs/patch-1
...
Add new Atlassian integrations
2023-11-09 13:56:19 +05:30
Sidharth Vinod
c8a826dfce
Merge pull request #5012 from StefonSimmons/patch-1
...
Update index.md
2023-11-09 13:51:27 +05:30
Sidharth Vinod
0075538431
fix linting
2023-11-09 13:49:42 +05:30
Braulio Ruiz
8db9700807
fix: set proper shiki theme for light and dark modes
2023-11-09 13:36:44 +05:30
Braulio Ruiz
1fa8de2771
fix: change shiki theme to github-light
2023-11-09 13:36:44 +05:30
Sidharth Vinod
09d9c31d53
chore: Reset mock in edgeMarker test
2023-11-09 11:36:45 +05:30
nashtechlabs
fadae38bec
Merge branch 'develop' into docs/patch-1
2023-11-09 05:34:57 +07:00
Sidharth Vinod
e46626d3ed
Merge branch 'develop' into refactor/unifyEdgeMarkers
...
* develop: (155 commits)
chore(deps): update all patch dependencies
chore: release v10.6.1
fix(flow): fix invalid ellipseText regex
review fixes
Update XYChart's nav link in the docs template
add comment for ts ignore
move decodeEntities to utils
review fixes
chore(deps): update all minor dependencies
chore: Point to correct changelog
add spec
fix: getMessageAPI so it considers entity codes
chore(deps): update all patch dependencies
Update integrations-community.md
docs: upate the list of tools with native support of mermaid
Fix typo in build-docs.yml
Updated mermaid version
Limiting the number of edges that are allowed in the flowchart
Update README.md
Update README.md
...
2023-11-09 02:39:54 +05:30
Sidharth Vinod
8f572021af
chore: Add test for invalid marker
2023-11-09 02:38:48 +05:30
Sidharth Vinod
4952b13ad0
fix: Ignore unknown arrow type values
...
Co-authored-by: Alois Klink <alois@aloisklink.com>
2023-11-09 02:37:38 +05:30
Sidharth Vinod
d1fba9c567
Merge pull request #4824 from JackuB/patch-1
...
Docs: add Mermaid for Slack integration
2023-11-08 20:58:40 +00:00
Sidharth Vinod
c2e26baf4d
Merge pull request #4930 from Mister-Hope/patch-2
...
feat(gantt): update styles
2023-11-08 20:42:53 +00:00
nashtechlabs
f6b1e049f1
Merge branch 'develop' into docs/patch-1
2023-11-08 15:56:22 +07:00
Alois Klink
f487dcd57b
Merge commit 'b61ea4b8aa2f5d38ad6af828ed0620a589ec5786'
...
This fixes the link to xyChart in the docs on the `master` branch.
2023-11-08 08:42:05 +00:00
Alois Klink
71478f5a64
Merge pull request #5014 from Abrifq/patch-2
...
Update XYChart's nav link in the docs template
2023-11-08 08:22:30 +00:00
dev1
c9ace33cf1
Add new Atlassian integrations
2023-11-08 14:39:06 +07:00
Steph
c117447bb3
add latest blog post
2023-11-07 00:54:32 -08:00
Steph
1f7aec7405
Merge branch 'master' into update-latest-news
2023-11-07 00:50:51 -08:00
renovate[bot]
6e74e91b5d
chore(deps): update all patch dependencies
2023-11-07 05:11:34 +00:00
Sidharth Vinod
eb4bd314b6
Merge pull request #5002 from ad1992/bug/4983-fix-getMessageAPI
...
fix: getMessageAPI so it considers entity codes
2023-11-07 05:04:53 +00:00
Alois Klink
d1045ed644
Merge remote-tracking branch 'origin/release/10.6.1'
2023-11-06 14:29:58 +00:00
Aakansha Doshi
51d076a83b
Merge branch 'develop' into bug/4946-fix-svg-order-sequence-participant
2023-11-06 19:54:32 +05:30
Alois Klink
65daab2aaf
chore: release v10.6.1
...
Fixes
=====
- Flowchart: Fix a freeze when using a `(` character in an ellipse node
2023-11-06 13:57:01 +00:00
Aakansha Doshi
dff8b783b8
fix
2023-11-06 19:02:10 +05:30
Aakansha Doshi
78c1a3d980
fix
2023-11-06 18:57:47 +05:30
Aakansha Doshi
23cbf50413
fix: render the participants in same order as they are created
2023-11-06 18:47:38 +05:30
Knut Sveidqvist
7c7f3dd8be
Merge pull request #5016 from aloisklink/fix/4964-fix-invalid-ellipseText-regex
...
fix(flow): fix invalid ellipseText regex
2023-11-06 11:16:44 +00:00
Alois Klink
172d90e731
fix(flow): fix invalid ellipseText regex
...
This invalid regex was causing Mermaid to freeze.
2023-11-06 10:08:12 +00:00
Aakansha Doshi
dff13439f6
review fixes
2023-11-06 12:17:43 +05:30
Arda Aydın
b61ea4b8aa
Update XYChart's nav link in the docs template
...
The site gives 404 with xychart but navigates correctly with xyChart
2023-11-05 22:35:36 +03:00
SteffenLm
b5fd8fb7c1
fix text-decoration for abstract attibutes
2023-11-03 20:55:42 +01:00
StefonSimmons
4ba3e2cff3
Update index.md
...
fix typo
2023-11-03 15:51:33 -04:00
Aakansha Doshi
a818f3e3ae
add comment for ts ignore
2023-11-03 13:31:21 +05:30
Aakansha Doshi
58bad981be
move decodeEntities to utils
2023-11-03 13:25:26 +05:30
Aakansha Doshi
6a5b7c40bd
Merge branch 'develop' into bug/4983-fix-getMessageAPI
2023-11-03 13:18:38 +05:30
Aakansha Doshi
6e6e92a1d1
review fixes
2023-11-03 13:16:30 +05:30
Steph
99244ffae5
Merge branch 'master' into update-latest-news
2023-11-02 05:05:04 -07:00
renovate[bot]
0d4faef758
chore(deps): update all minor dependencies
2023-11-01 19:42:28 +00:00
Sidharth Vinod
0c5cf72235
chore: Point to correct changelog
2023-11-01 20:18:49 +05:30
Guy Pursey
57a9d7356c
GitGraph: made reroute fn more readable
...
Pre-commit lint hook had made the use of ternaries harder to read
than I'd originally intended so I introduced an additional
variable which explains what is being checked and keeps ternaries
from becoming obscured.
2023-10-31 17:24:13 +00:00
Guy Pursey
a9c5d903c5
GitGraph: simplified branch check in arrow rerouting fn
...
Wanted to avoid repetition given that the originally nested
ternaries had the same structure
2023-10-31 17:24:13 +00:00
Guy Pursey
bf52e76a39
GitGraph: Moved branch curve check to within reroute check fn
...
Based on review by @nirname. I had originally been trying
to minimise number of new arguments being passed to
rerouting check but as the branch curve check is not used
elsewhere and is part of the same rerouting check it makes
sense for them to be together.
Position information now passed to rerouting fn instead.
2023-10-31 17:24:13 +00:00
Guy Pursey
31a8e040fa
GitGraph: corrected minor typo in comment.
2023-10-31 17:24:13 +00:00
Guy Pursey
0555368e1c
GitGraph: added branch checking to rerouting
...
Hypothesised that working out which branch needed checking for
overlapping commits might be missing, so added that as a
nested ternary and passed result as new argument to rerouting
check.
If commits are found on the branch which will be getting the
curve (whichever branch is lower or more to the right of main
than the other, for now), then the arrow will be rerouted.
I may refactor in a follow-up commit and I think there's scope
to simplify the logic but this is a test for now.
2023-10-31 17:24:13 +00:00
Guy Pursey
3e18e76d31
GitGraph: removed check of branch with main from arrow reroute fn
...
Checking if branch was same as main turned out to be redundant
for now, since there don't seem to be any cases where routing
curves into main.
This fixes issue found in review by @nirname and avoids a
situation where branching from the same commit results in
unnecessary rerouting.
2023-10-31 17:24:13 +00:00
Guy Pursey
7c87df7cf6
GitGraph: rename overlap check to shouldRerouteArrow
...
The function also now does an additional check to see
if source branch in overlap check is on main.
As we're no longer purely checking for an overlap and
the only use of this function is to reroute the arrows
to avoid running over commits, this more literal name
should be clearer.
2023-10-31 17:24:13 +00:00
Guy Pursey
dba7197fc6
GitGraph: simplified overlapping check fn
2023-10-31 17:24:13 +00:00
Guy Pursey
461a293d71
GitGraph: refactored overlapping fn for efficiency/performance
...
On previous rewrite, I had created new functions within the
overlapping functions but these were being recreated on each
iteration of Object.some(). I moved them outside this for
clarity and so they're not recreated each iteration.
2023-10-31 17:24:13 +00:00
Guy Pursey
9f8457d249
GitGraph: Rewrote overlap fn to make main branch exception to rule.
2023-10-31 17:24:13 +00:00
Guy Pursey
8c43d2273f
GitGraph: added destination branch check into overlapping fn.
2023-10-31 17:24:13 +00:00
Guy Pursey
9469f759a9
GitGraph: Moved overlapping commit arrow colour inside conditional
2023-10-31 17:24:13 +00:00
Guy Pursey
4787bb07df
GitGraph: corrected object method in hasOverlappingCommits
2023-10-31 17:24:13 +00:00
Guy Pursey
33050e1812
GitGraph: Update variable names in drawArrow fn
2023-10-31 17:24:13 +00:00
Guy Pursey
6dc8e58b47
GitGraph: Refactor hasOverlappingCommits function
...
Changed argument names from commit1 and commit2 to
commitA and commitB respectively to prevent confusion
with seq number values.
Replaced Array filter method with array some method
so that as soon as one overlap is found, function is
finished.
Used Object.entries instead of Object.keys to reduce
number of variables needed and make function easier
to read.
2023-10-31 17:24:13 +00:00
Guy Pursey
d9daf19055
GitGraph: Correct commit variable in overlap check.
...
Originally, the function was checking if any commits were on the
same branch as `commit2`, the destination commit.
However, in order to avoid a conflict, we should only need to
check whether any commits are on the same branch as `commit 1`.
Updated and moved commenting as well.
2023-10-31 17:24:13 +00:00
Guy Pursey
f42cec282a
GitGraph: Add check for direction of merge arrow to determine colour.
2023-10-31 17:24:13 +00:00
Aakansha Doshi
fff25e7e2c
add spec
2023-10-31 19:39:43 +05:30
Aakansha Doshi
2a8323f951
Merge branch 'develop' into bug/4983-fix-getMessageAPI
2023-10-31 18:35:25 +05:30
Aakansha Doshi
390e22cc0b
fix: getMessageAPI so it considers entity codes
2023-10-31 18:28:45 +05:30
Sebastian Holmqvist
a3ee21d7fc
fix(tooltip): change position of tooltip to not cover node
...
Position the tooltip centered, just below the node being hovered.
Update packages/mermaid/src/diagrams/flowchart/flowDb.js
Co-authored-by: Sidharth Vinod <sidharthv96@gmail.com>
2023-10-31 12:51:47 +01:00
Sebastian Holmqvist
8f2a5064cb
fix(tooltip): remove redundant scroll offset
...
window.scrollY is already account for which means document.body.scrollTop incorrectly offsets the tooltip vertically.
The same is not true for horizontal position.
2023-10-31 08:38:19 +01:00
Sidharth Vinod
77667b94d3
Merge pull request #4975 from mermaid-js/add-docusaurus
...
Docs: add Docusaurus to "Integrations - Community" page
2023-10-31 06:42:09 +00:00
renovate[bot]
e8a04faa36
chore(deps): update all patch dependencies
2023-10-31 06:13:41 +00:00
Faris
61fb9e50d3
Merge branch 'develop' into fix/1294_exhaustive-clear-sequenceDb-variables
2023-10-30 13:39:09 +03:00
Alex Titarenko
e98aa55577
docs: upate the list of tools with native support of mermaid
2023-10-27 18:58:30 -07:00
Knut Sveidqvist
03c59adaed
Parsing of block arrows with directions, creating a dedicated new node for this.
2023-10-26 22:02:16 +02:00
Knut Sveidqvist
7198fe55a9
Parsing of block arrows with directions, creating a dedicated new node for this.
2023-10-26 22:01:44 +02:00
Harshit Anand | Frontend Developer | ReactJS
3394541b41
Merge branch 'develop' into bug/4716_fix_target_blank_getting_sanitized
2023-10-26 14:57:15 +05:30
Sahil Nagpure
36a727d44e
Merge branch 'develop' into patch-1
2023-10-26 11:44:46 +05:30
Harshit Anand
06d2ba8398
fix: added two unit tests to check for the secured anchor tag
2023-10-25 21:17:53 +05:30
Knut Sveidqvist
29942c04dc
Updated mermaid version
2023-10-25 11:07:12 +02:00
Knut Sveidqvist
fc28c1da63
Limiting the number of edges that are allowed in the flowchart
2023-10-25 11:06:37 +02:00
Sahil Nagpure
9637b0c187
Merge branch 'develop' into patch-1
2023-10-25 12:24:03 +05:30
RounakJoshi09
122e5929bc
Merge branch 'develop' into bug/#4497_unable-to-cherrypick-merge-commit
2023-10-23 20:40:02 +05:30
Harshit Anand
7960f94eba
fix: shifted dompurify.addhook functions inside removescript
2023-10-23 16:09:51 +05:30
Harshit Anand
b36cdaceca
Merge branch 'develop' of https://github.com/mermaid-js/mermaid into bug/4716_fix_target_blank_getting_sanitized
2023-10-23 12:24:22 +05:30
Harshit Anand
3b8c48dd26
fix: added type Element to the node used in callback in the dompurify.addhook
2023-10-23 12:23:08 +05:30
steph
bc247b1d46
add docusaurus to community integrations
2023-10-22 14:18:41 -07:00
RounakJoshi09
f92ad6307e
Merge branch 'develop' into bug/#4497_unable-to-cherrypick-merge-commit
2023-10-22 19:34:05 +05:30
Sahil Nagpure
f31cddee0c
Update classDiagram.md
...
Fixed typo.
2023-10-22 12:27:55 +05:30
Remco Haszing
ab9b9abdf9
Replace rehype-mermaidjs with rehype-mermaid
...
The package was renamed.
2023-10-20 16:55:01 +02:00
Knut Sveidqvist
d32c18a43c
Merge branch 'master' into develop
2023-10-20 14:33:07 +02:00
Knut Sveidqvist
b70959daa7
Version 10.5.1
2023-10-20 14:30:52 +02:00
Per Brolin
aaf0b474d4
Increased version to 10.5.1
2023-10-20 14:18:07 +02:00
Knut Sveidqvist
f3f25c7874
#3358 Adding support for space blocks and different shapes
2023-10-20 12:30:25 +02:00
Knut Sveidqvist
61bc293a95
#4967 Reverting optimimization that breaks subgraphs
2023-10-20 11:12:56 +02:00
Steph
87675e687e
add latest blog post
2023-10-19 11:36:46 -07:00
RounakJoshi09
827808dca3
Merge Conflict Resolved
2023-10-19 10:33:32 +05:30
RounakJoshi09
d65191f6c1
Merge branch 'develop' into bug/#4497_unable-to-cherrypick-merge-commit
2023-10-19 10:26:25 +05:30
RounakJoshi09
6eee8973ba
Merge branch 'bug/#4497_unable-to-cherrypick-merge-commit' of https://github.com/RounakJoshi09/mermaid into bug/#4497_unable-to-cherrypick-merge-commit
2023-10-18 21:08:14 +05:30
RounakJoshi09
d8500f9e08
Suggested Changes FOR PR DONE
2023-10-18 20:59:55 +05:30
Anthony Damico
31ec3d1496
Update questions-and-suggestions.md
2023-10-17 10:30:29 -04:00
renovate[bot]
e4350f80fe
chore(deps): update all patch dependencies
2023-10-16 19:52:01 +00:00
Faris
3128ba73a0
chore(sequence): Update packages/mermaid/src/docs/syntax/sequenceDiagram.md
...
Co-authored-by: Sidharth Vinod <sidharthv96@gmail.com>
2023-10-16 19:36:44 +03:00
Sidharth Vinod
7eac75c15c
Merge pull request #4928 from mribeirodantas/fix-minor-typos
...
fix(typos): Fix minor typos in the source code
2023-10-16 14:00:27 +00:00
Alois Klink
d04f4c27fc
Merge pull request #4889 from dreathed/bug/4345_bundle_current_config_consitently_in_one_file
...
making consitent config imports from diagramAPI
2023-10-15 22:54:10 +00:00
Knut Sveidqvist
74a9e86e74
#3358 Putting the elements back in
2023-10-15 22:55:29 +02:00
Knut Sveidqvist
a641fd51e8
#3358 Adding support for column statements
2023-10-15 22:21:25 +02:00
RounakJoshi09
0a0bd0ac97
Merge branch 'develop' into bug/#4497_unable-to-cherrypick-merge-commit
2023-10-14 07:58:09 +05:30
RounakJoshi09
4051b42b5a
documentation added, Tests Fixed
2023-10-14 07:26:23 +05:30
RounakJoshi09
6e5cd2b3c2
All Unit Tests Passing
2023-10-14 05:49:51 +05:30
Harshit Anand
345e82abee
fix: removed static target=_blank instaed value will fetched from the target attribute
2023-10-14 00:50:09 +05:30
RounakJoshi09
3118c7c532
Unit Test Cases Added
2023-10-13 23:49:01 +05:30
Faris Nabiev
fc0ade2985
chore(sequence): update doc for actors/participant creation/deletion fix
2023-10-13 12:07:36 +03:00
Faris Nabiev
b4f444869e
fix: add imperativeState and replace sequenceDb global variables with it
2023-10-12 16:39:31 +03:00
Marcel Ribeiro-Dantas
9080f1f354
Revert typo fix
2023-10-12 01:33:25 -03:00
Marcel Ribeiro-Dantas
4b8441a1a0
Prettify table
2023-10-12 01:27:08 -03:00
RounakJoshi09
13d85b6ee5
Parser and Logic For Parent Commit Added
2023-10-12 02:35:43 +05:30
Marcel Ribeiro-Dantas
00b38c55e9
Merge branch 'develop' into fix-minor-typos
2023-10-11 16:43:47 -03:00
Marcel Ribeiro-Dantas
ab2345093e
Revert error typo fix
2023-10-11 16:41:04 -03:00
RounakJoshi09
995449cbf6
Error Message Changed
2023-10-11 20:40:14 +05:30
Sidharth Vinod
d1b386b5c9
Revert PH changes ( #4903 )
2023-10-11 11:32:24 +05:30
RounakJoshi09
ce3d9fcdde
Added test suggested on PR
2023-10-10 11:09:30 +05:30
Harshit Anand
c279a9f9ed
fix: clean link unit test resolved
2023-10-10 01:05:55 +05:30
RounakJoshi09
cdb4639aa4
bug/#3251_linkStyle-can't-specify-ids Fixed
2023-10-10 00:16:05 +05:30
Harshit Anand
2a9eb7f123
fix: target blank removed from anchor tag
2023-10-09 21:13:53 +05:30
Mr.Hope
1fec55d5f7
feat(gantt): update styles
2023-10-09 11:25:09 +08:00
Mr.Hope
444e81ae8a
fix(class): avoid duplicate definition of fill
2023-10-09 11:08:46 +08:00
Jakub Mikulas
4559ba625c
docs(integrations): add Mermaid for Slack
2023-10-08 21:16:36 +02:00
Hans Blankenhaus
497ffde9fe
undo changes for commonDb to avoid circular imports
2023-10-08 18:22:27 +02:00
Hans Blankenhaus
01203d884c
fix classDB
2023-10-08 15:32:40 +02:00
Hans Blankenhaus
846fb3f8f8
making consitent config imports from diagramAPI
2023-10-08 14:17:45 +02:00
Marcel Ribeiro-Dantas
30b3e6213f
fix(typos): Fix minor typos in the source code
...
Signed-off-by: Marcel Ribeiro-Dantas <mribeirodantas@seqera.io>
2023-10-07 22:16:11 -03:00
Nikolay Rozhkov
f346c3f511
Merge branch 'develop' into patch-1
2023-10-06 12:42:56 +03:00
Martin Pedersen
41c7b08c99
prevent-inherited-lineheights-on-edgeterminal-4083
2023-10-05 16:52:15 +02:00
Nikolay Rozhkov
3a0ce43252
Merge branch 'develop' into feature/4269_add_xychart
2023-10-05 14:44:55 +03:00
Guy Pursey
97487acbc3
Updated GitGraph doc amendment based on feedback in PR.
2023-10-05 12:13:12 +01:00
Guy Pursey
395ee5ef06
Update notes on orientation in GitGraph documentation
...
Attempt to make the documentation around left-right and top-down orientation clearer than it currently is, addressing issue #4885 .
2023-10-04 15:37:50 +01:00
Sidharth Vinod
1d9ce74f64
Merge branch 'master' into develop
...
* master:
Update docs
Fix lint issue
Fix release version
Fix TopBar
Add MC to integrations
Add TopBar
Docs: Add Product Hunt info (#4900 )
2023-10-04 14:36:31 +05:30
Sidharth Vinod
345d0d0bd2
Fix lint issue
2023-10-04 14:26:03 +05:30
Sidharth Vinod
f49e8c5784
Fix release version
2023-10-04 14:19:19 +05:30
Knut Sveidqvist
da79b371fe
#3358 Recursive positioning paddings
2023-10-04 10:44:29 +02:00
Sidharth Vinod
a6bb1ea28c
Fix TopBar
2023-10-04 14:09:34 +05:30
Sidharth Vinod
cda7a61526
Add MC to integrations
2023-10-04 14:07:08 +05:30
Sidharth Vinod
d17c752229
Add TopBar
2023-10-04 14:06:43 +05:30
Steph
459f5a58a3
Docs: Add Product Hunt info ( #4900 )
...
* update card and announcements page
* update integrations link and add product hunt badge
* Revert navbar link change
---------
Co-authored-by: Sidharth Vinod <sidharthv96@gmail.com>
2023-10-04 07:32:30 +00:00
Knut Sveidqvist
c8d155c455
#3358 Recursive positioning
2023-10-03 20:12:33 +02:00
Knut Sveidqvist
f00871a6b4
#3358 Recursive positioning
2023-10-03 14:19:08 +02:00
Knut Sveidqvist
b4e32542e8
#3358 Recursive positioning
2023-10-03 12:56:47 +02:00
Subhash Halder
0d64d8d8e7
Merge branch 'develop' into feature/4269_add_xychart
2023-10-02 20:52:47 +05:30
Subhash Halder
42f8990834
Changed requested by code review
2023-10-02 20:48:04 +05:30
0xflotus
0239e49d92
docs: fixed typo
2023-10-02 11:16:51 +02:00
Knut Sveidqvist
279c1ee6ba
Merge branch 'master' into develop
2023-10-02 10:22:21 +02:00
Knut Sveidqvist
9644df4021
Merge branch 'release/10.5.0'
2023-10-02 10:18:33 +02:00
Knut Sveidqvist
bb0d549d0d
Mermaid release v10.5.0
2023-10-02 10:00:13 +02:00
Alois Klink
1bd87e33f0
Merge pull request #4883 from FirstTimeInForever/docs/update-jetbrains-integration
...
Update link for the Mermaid integration in JetBrains IDEs
2023-09-30 17:43:48 +00:00