Guy Pursey
b0b276898a
GitGraph: fixed an e2e branch for vertical branch
...
Fix for error spotted by @mathbraga
2023-10-31 17:24:13 +00:00
Guy Pursey
25a678caec
GitGraph: added e2e tests for multiple branches from one commit
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
3ba33c8b75
GitGraph: added more to demos
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
902a9dd42b
GitGraph: added and updated demos to align with some of e2e testing
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
69ec4a0359
GitGraph: Added cherry-pick and merge demos for to GitGraph.
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
60bb7b5b6c
GitGraph: updated demo page to include top-to-bottom examples.
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
839645f161
GitGraph: Add more example diagrams to test with.
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
Sidharth Vinod
b85a48f7f7
Merge pull request #4976 from mermaid-js/renovate/patch-all-patch
...
chore(deps): update all patch dependencies (patch)
2023-10-31 06:40:19 +00:00
Sidharth Vinod
34f1db399f
Merge pull request #4979 from karthxk07/develop
...
Update README.md
2023-10-31 06:40:05 +00:00
renovate[bot]
e8a04faa36
chore(deps): update all patch dependencies
2023-10-31 06:13:41 +00:00
Sidharth Vinod
d714ecb4d7
Merge pull request #4994 from alex-titarenko/docs/add-noteshub-tool
...
docs: Add NotesHub to integrations-community page
2023-10-31 06:06:59 +00:00
Sidharth Vinod
54ca3e789f
Merge pull request #4991 from sadikkuzu/patch-1
...
Fix typo in build-docs.yml
2023-10-31 06:03:26 +00:00
Faris
61fb9e50d3
Merge branch 'develop' into fix/1294_exhaustive-clear-sequenceDb-variables
2023-10-30 13:39:09 +03:00
Alex Titarenko
cb06962c85
Update integrations-community.md
2023-10-27 20:27:16 -07:00
Alex Titarenko
e98aa55577
docs: upate the list of tools with native support of mermaid
2023-10-27 18:58:30 -07:00
SADIK KUZU
672a0edc59
Fix typo in build-docs.yml
2023-10-27 12:22:14 +03: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
Harshit Anand
54ab3fc3b2
fix: added an e2e test case for classdiagram with anchor tag
2023-10-26 14:55:04 +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
5f117fc2b2
Merge branch 'master' into develop
2023-10-25 13:36:10 +02:00
Knut Sveidqvist
d7ec9e7b0d
Merge branch 'release/10.6.0'
2023-10-25 13:35:58 +02:00
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
Karthik
ff4d68fd55
Update README.md
2023-10-25 14:11:38 +05:30
Sahil Nagpure
9637b0c187
Merge branch 'develop' into patch-1
2023-10-25 12:24:03 +05:30
RounakJoshi09
5834818ebe
Linting Issue Fixed
2023-10-23 21:57:38 +05:30
RounakJoshi09
7f1e0ab422
Updated gitgraph.md
2023-10-23 21:14:38 +05:30
RounakJoshi09
b461efab5d
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-23 21:09:43 +05:30
RounakJoshi09
ca96c0f45f
Linting Issue Fixed
2023-10-23 21:06:51 +05:30
