* 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
...
* 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
...
* 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
* next: (39 commits)
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
fix linting
fix: set proper shiki theme for light and dark modes
fix: change shiki theme to github-light
add latest blog post
GitGraph: made reroute fn more readable
GitGraph: simplified branch check in arrow rerouting fn
GitGraph: added commit IDs to e2e test to remove false positives
GitGraph: Moved branch curve check to within reroute check fn
GitGraph: corrected minor typo in comment.
GitGraph: added 2x e2e tests for branches not used immediately
GitGraph: added branch checking to rerouting
GitGraph: Added e2e tests for deferred branch use.
GitGraph: e2e tests, added commit IDs to test graphs
GitGraph: fixed an e2e branch for vertical branch
...
* develop: (39 commits)
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
fix linting
fix: set proper shiki theme for light and dark modes
fix: change shiki theme to github-light
add latest blog post
GitGraph: made reroute fn more readable
GitGraph: simplified branch check in arrow rerouting fn
GitGraph: added commit IDs to e2e test to remove false positives
GitGraph: Moved branch curve check to within reroute check fn
GitGraph: corrected minor typo in comment.
GitGraph: added 2x e2e tests for branches not used immediately
GitGraph: added branch checking to rerouting
GitGraph: Added e2e tests for deferred branch use.
GitGraph: e2e tests, added commit IDs to test graphs
GitGraph: fixed an e2e branch for vertical branch
...
* 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
Moved some types around
Removed unnecessary params
Co-authored-by: Reda Al Sulais <u.yokozuna@gmail.com>
Co-authored-by: Alois Klink <alois@aloisklink.com>
* next: (193 commits)
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
Update docs
Documentation: clarify sentence
Fix lint
Fix typo
fix typo
Add new Atlassian integrations
chore(deps): update all patch dependencies
Update demos/sequence.html
chore: release v10.6.1
fix
fix
fix: render the participants in same order as they are created
fix(flow): fix invalid ellipseText regex
...
* develop: (126 commits)
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
Update docs
Documentation: clarify sentence
Fix lint
Fix typo
fix typo
Add new Atlassian integrations
chore(deps): update all patch dependencies
Update demos/sequence.html
chore: release v10.6.1
fix
fix
fix: render the participants in same order as they are created
fix(flow): fix invalid ellipseText regex
...
* 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
...
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.
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.
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.
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.
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.
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.
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.
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.
Justin Greywolf