Sidharth Vinod
7f4368415d
chore: Add eslint-unicorn & fix
2022-11-23 01:05:08 +05:30
Per Brolin
9eb506f6c5
Revert "Added pie"
...
This reverts commit 1d9fefe7ac
.
2022-11-22 10:04:28 +01:00
Per Brolin
fdbc4ce0ed
Merge branch 'develop' of github.com:mermaid-js/mermaid into develop
2022-11-21 14:45:25 +01:00
Knut Sveidqvist
29a02d1ab5
Merge pull request #3809 from aloisklink/use-dagre-d3-es
...
Replace `dagre`/`dagre-d3` with `dagre-d3-es`
2022-11-21 13:31:35 +01:00
Sidharth Vinod
b04517b146
chore: Cleanup
2022-11-20 12:00:34 +05:30
Sidharth Vinod
024ee4213f
Merge branch 'develop' into sidv/splitDiagrams
...
* develop: (233 commits)
style(docs): use `github-dark` hightlight theme
refactor(docs): use default vitepress highlighter
fix: Move redirection to router
ci(renovate): disable pinning dependencies
Revert "chore(deps): pin dependencies"
change shiki getHighlighter import
create separate spec for stateRenderer-v2
diagramStates should not be global; pass it into functions; minor comment fixes
diagramClasses no longer needs to be cached; mermaidAPI no longer calls it repeatedly
(minor) import expectTypeOf in spec
(minor) fix JSdoc tag
+ spec stateRenderer-v2.js getClasses() to verify it returns a {}
(minor) fix JSdoc types in comments
(minor) add comments, remove duplicated line
chore: Add master to link checker
chore: Add docs to redirect.ts
stateDB classes must be a {} not []
feat: Redirect old documentation links.
add stateDiagram-v2 to list of graphs with classDefs
fix(docs): ClassDiagram table
...
2022-11-20 11:58:55 +05:30
Mason Malone
a11ab3d5ea
Disallow leading whitespace before delimiter
2022-11-19 12:52:49 -08:00
Sidharth Vinod
2e028ce36d
chore: Unify `registerLazyLoadedDiagrams`
2022-11-20 00:38:35 +05:30
Mason Malone
70f024735b
Add title support using YAML frontmatter
2022-11-18 20:42:54 -08:00
Alois Klink
537a627b75
test(e2e): test for mindmap before snapshot
...
Sometimes, the mindmap e2e tests take a snapshot when the mindmap
SVG has been created, but hasn't yet been fully rendered.
This adds a quick check for a mindmap section root, so that the
snapshot is only taken after the mindmap diagram has started
rendering.
I was also running into JSDoc ESLint warnings, so I moved the file
into a TypeScript file to fix those warnings.
2022-11-18 18:31:14 +00:00
Alois Klink
57edcfe87d
test(e2e): remove unused mermaid.spec.js file
...
All tests have been moved to `mindmap.spec.js` in a previous commit.
2022-11-18 18:07:40 +00:00
Alois Klink
b9dcdb00a5
test(e2e): move mindmap tests to mindmap.spec.js
...
Currently, we have mindmap tests in the
cypress/integration/rendering/mermaid.spec.js which is a bit
odd. They should probably all be in the mindmap.spec.js file.
2022-11-18 17:58:17 +00:00
Ashley Engelund (weedySeaDragon @ github)
0adc6a6112
remove a11y from individual diagrams; now happens in mermaidAPI render
2022-11-17 12:28:11 -08:00
Ashley Engelund (weedySeaDragon @ github)
03a11e103e
(minor) fix typo
2022-11-17 12:19:31 -08:00
Sidharth Vinod
beab2278d8
feat: Async mermaid docs
2022-11-14 22:06:26 +05:30
Per Brolin
51a84eeb90
Merge branch 'develop' of github.com:mermaid-js/mermaid into develop
2022-11-14 16:34:57 +01:00
Sidharth Vinod
a83f88bdf1
chore: Merge master to develop
2022-11-10 13:51:53 +05:30
Sidharth Vinod
c7f7ff39ce
fix: Import path in viewer.js
2022-11-09 00:43:19 +05:30
Sidharth Vinod
1b2dce99c9
Merge branch 'release/9.2.1' of https://github.com/mermaid-js/mermaid into sidv/fixLL
...
* 'release/9.2.1' of https://github.com/mermaid-js/mermaid :
Fixing applitools batches
2022-11-08 20:15:13 +05:30
Knut Sveidqvist
ba7f83019f
Fixing applitools batches
2022-11-08 15:25:05 +01:00
Sidharth Vinod
6d2552ea6e
fix: Filenames
2022-11-08 19:26:02 +05:30
Sidharth Vinod
20b4358c0e
fix: Make options in registerExternalDiagrams optional
2022-11-08 19:21:49 +05:30
Sidharth Vinod
aab8f9273f
Merge branch 'feat/3701-expose-registerDiagram' into sidv/fixLL
...
* feat/3701-expose-registerDiagram:
feat: add `mermaidAPI.registerDiagram()`
refactor(mermaid): remove registerDiagram cb func
fix(mermaid): fix DiagramDefinition types
2022-11-08 13:50:54 +05:30
Knut Sveidqvist
357a928cce
Fixing applitools batches
2022-11-04 13:05:46 +01:00
Per Brolin
1d9fefe7ac
Added pie
2022-11-04 12:44:13 +01:00
Knut Sveidqvist
4c779beda9
Merge pull request #3729 from DarkNami/feature/1598_add_tick_interval
...
feat(gantt): Add option 'tickInterval' for custom tick interval
2022-11-01 13:50:38 +01:00
DarkNami
3166f689f9
feat(gantt): Add option 'tickInterval' for custom tick interval
...
See issue #1598
2022-10-27 16:47:42 +08:00
Ashley Engelund (weedySeaDragon @ github)
599d035daf
merge MERMAID/develop into branch
2022-10-25 07:42:57 -07:00
Knut Sveidqvist
3dca7d10d5
Merge pull request #3668 from mermaid-js/3659_height_handling
...
#3659 Adding height when not using maxWidth
2022-10-25 14:48:50 +02:00
Knut Sveidqvist
f4bb978a87
Merge pull request #3649 from DKurilo/feat/3247-statements-aliases
...
add statement aliases for ER diagram
2022-10-25 14:46:29 +02:00
Knut Sveidqvist
27a68819bc
Merge pull request #3647 from DKurilo/feat/1414-notes-to-class-diagram
...
add the way to add notes to class diagram
2022-10-25 14:45:03 +02:00
Alois Klink
f41e34e61a
feat: add `mermaidAPI.registerDiagram()`
...
Exposes the registerDiagram() function publically as
`mermaid.mermaidAPI.registerDiagram` so that users can add their
own diagrams at bundle-time.
This is instead of using the lazyLoadedDiagrams config setting.
2022-10-23 16:53:25 +01:00
Jeroen Ekkelkamp
0c4edd332c
Ran linter (npm run lint:fix)
2022-10-19 20:06:54 +02:00
Knut Sveidqvist
904c011baf
Merge remote-tracking branch 'origin/develop' into develop
2022-10-19 14:33:55 +02:00
Knut Sveidqvist
352dd5dcf7
testcode
2022-10-19 14:32:28 +02:00
Santosh Viswanatham
c71b6e31f7
Merge branch 'develop' into feat/3601-cspell-configuration
2022-10-18 21:02:38 +05:30
Dima Kurilo
20751a6496
fix cypress tests for erDiagram, add eslint-plugin-no-only-tests plugin because of this comment: https://github.com/mermaid-js/mermaid/pull/3647#issuecomment-1281163858
2022-10-17 13:20:17 -04:00
Dima Kurilo
75e11b1fde
add basic render (cypress) test for classDiagram-v2 too
2022-10-17 12:33:23 -04:00
Dima Kurilo
cead1f36f4
add basic render (cypress test for notes
2022-10-17 12:13:22 -04:00
Dima Kurilo
3108e896b6
add renedering (cypress) tests
2022-10-17 12:03:51 -04:00
Alois Klink
989d716c36
style: fix @cspell/eslint warnings
...
Ignores some names of contributors, and adjusts some capitilization
spacing to fix all cspell warnings.
2022-10-16 10:23:23 +01:00
Santosh Viswanatham
1f642ca9b6
Merge branch 'develop' into feat/3601-cspell-configuration
2022-10-15 19:48:08 +05:30
devcer
478c387491
added words to cspell ignore words list, removed mywords.txt
2022-10-15 19:43:07 +05:30
Knut Sveidqvist
4be66554b3
#3659 Adding height when not using maxWidth
2022-10-13 14:26:05 +02:00
Ashley Engelund (weedySeaDragon @ github)
d1f3b889d6
add cypress tests for classDefs and applying classes to states
2022-10-11 08:33:43 -07:00
Knut Sveidqvist
bc5ef5fb7d
Fix for async issue in parse, adding parseAsync
2022-10-11 11:20:34 +02:00
Sidharth Vinod
23e590e09b
Revert "fix(test): Rerender"
...
This reverts commit a017ffc3c9
.
2022-10-10 22:04:33 +08:00
Sidharth Vinod
60e4585e20
Revert "fix: use async in render-after-error"
...
This reverts commit d59f878020
.
2022-10-10 22:04:05 +08:00
Sidharth Vinod
ba436cc37a
fix: Tests
2022-10-10 21:57:22 +08:00
Knut Sveidqvist
e876c35ef9
Merge pull request #3591 from mermaid-js/sidv/fixDetectDiagram
...
fix Detect diagram fallback
2022-10-10 13:43:41 +02:00
Sidharth Vinod
6e2deb1fa7
fix: Fix eslint warnings
2022-10-09 22:08:32 +08:00
Sidharth Vinod
069437842b
Merge branch 'develop' into sidv/fixDetectDiagram
...
* develop: (50 commits)
docs: Sync
capitalization fix
format Setup.md
format cSpell.json
format docs YAML
format cSpell.json
separate words & ignoreWords
fix: "skin param"
ignore the changelog
Revert "fix: "skin param""
fix: "skin param"
fix: "corresponding"
known terms
known terms
fix: "JetBrains"
known terms
known terms
fix: "stable"
known term
add known term
...
2022-10-08 12:35:40 +08:00
Knut Sveidqvist
646f76d343
Fix for broken test
2022-10-07 14:36:25 +02:00
Knut Sveidqvist
047e15951a
Fix for issue in classdiagram-v2 from the typescript updates
2022-10-07 12:17:35 +02:00
Knut Sveidqvist
802407c8ae
Merge remote-tracking branch 'origin/develop' into lazy-load-import
2022-10-07 10:46:16 +02:00
Knut Sveidqvist
439274c5ae
chore: Cleanup
2022-10-07 10:40:01 +02:00
Sidharth Vinod
cc55a82b64
Merge branch 'develop' into sidv/fixDetectDiagram
...
* develop:
chore: cleanup
fix: dynamic import
fix: Filename in viewer.js
fix: pnpm not found
fix: Import diagram
Updated logic for diagram loading
WIP
2022-10-07 16:30:34 +08:00
Sidharth Vinod
acd9a8aefb
Merge branch 'lazy-load-import' into sidv/fixE2E
...
* lazy-load-import:
chore: cleanup
fix: dynamic import
fix: Filename in viewer.js
fix: Import diagram
Updated logic for diagram loading
WIP
2022-10-07 15:02:47 +08:00
Sidharth Vinod
3e3de72093
fix: dynamic import
2022-10-07 14:51:37 +08:00
Sidharth Vinod
9f286b46ff
fix: Filename in viewer.js
2022-10-06 23:39:30 +08:00
Sidharth Vinod
1615c6d9f9
fix #3391 : Remove flowchart as fallback for diagram detection.
2022-10-06 19:14:25 +08:00
Sidharth Vinod
d59f878020
fix: use async in render-after-error
2022-10-06 17:49:10 +08:00
Sidharth Vinod
c919bef70e
fix: Import diagram
2022-10-06 13:47:00 +08:00
Knut Sveidqvist
0f2e0c2ab4
Updated logic for diagram loading
2022-10-05 22:03:05 +02:00
Knut Sveidqvist
c05c98c082
WIP
2022-10-05 13:14:05 +02:00
Sidharth Vinod
f9753fc621
chore: Update test URL
2022-10-05 16:04:26 +08:00
Sidharth Vinod
42b59a9e35
Merge remote-tracking branch 'upstream/develop' into sidv/fixE2E
...
* upstream/develop: (33 commits)
Updated lockfile
chore(deps-dev): update vite requirement from ^3.0.9 to ^3.1.4
chore(deps-dev): update typescript requirement from ^4.8.3 to ^4.8.4
chore(deps-dev): update @vitest/coverage-c8 requirement
chore(deps-dev): update @typescript-eslint/eslint-plugin requirement
chore(deps-dev): update esbuild requirement from ^0.15.8 to ^0.15.10
chore(deps-dev): update @commitlint/config-conventional requirement
chore(deps-dev): update eslint-plugin-jest requirement
chore(deps-dev): update @applitools/eyes-cypress requirement
chore(deps-dev): update jsdom requirement from ^20.0.0 to ^20.0.1
chore(deps-dev): update vitest requirement from ^0.23.1 to ^0.23.4
chore(deps-dev): update lint-staged requirement from ^13.0.0 to ^13.0.3
chore(deps): update @types/node requirement from ^18.7.21 to ^18.8.1
chore(deps-dev): update @typescript-eslint/parser requirement
Fix postbuild script
#3561 Adding cScale0-11 etc and usage of the colors from the mindmap diagram
Fix for broken test
Mindmap cleanup
Using cose-bilkent layout algorithm for mindmaps
chore(deps-dev): update husky requirement from ^8.0.0 to ^8.0.1
...
2022-10-05 14:58:40 +08:00
Sidharth Vinod
74bd576ebc
fix(mermaid): Add await to render in init.
2022-10-05 14:52:04 +08:00
Sidharth Vinod
a017ffc3c9
fix(test): Rerender
2022-10-05 14:08:53 +08:00
Sidharth Vinod
d3a81f025a
chore(tests): Interaction - cleanup
2022-10-04 16:59:05 +08:00
Sidharth Vinod
750f647b0d
fix(tests): Interaction - Security strict, other
2022-10-04 16:55:46 +08:00
Sidharth Vinod
2a9e56439e
fix(tests): Interaction test - Security loose.
2022-10-04 16:37:37 +08:00
Knut Sveidqvist
8ee321fd7b
#3561 Adding cScale0-11 etc and usage of the colors from the mindmap diagram
2022-10-03 14:51:13 +02:00
Knut Sveidqvist
0a2804c641
Mindmap cleanup
2022-10-03 11:08:55 +02:00
Knut Sveidqvist
5079fa93b4
Using cose-bilkent layout algorithm for mindmaps
2022-10-03 10:05:12 +02:00
Knut Sveidqvist
56add0756f
Lazy loading fix for example-diagram and mindmaps
2022-10-03 07:01:56 +02:00
Per Brolin
6ebfbb2f9e
Arrow tip aligned to edge of box
2022-09-29 20:37:57 +02:00
Knut Sveidqvist
f46f8752ca
Adding example diagram as a template for a new diagram
2022-09-28 17:49:47 +02:00
Knut Sveidqvist
053a20bd33
Returning the borders to the e2e tests
2022-09-28 15:33:33 +02:00
Knut Sveidqvist
f60c7fff65
Merge branch 'develop' into 3061_making_a_monorepo
2022-09-28 14:26:07 +02:00
Knut Sveidqvist
fe8df78322
Clarification in the docs regarding directions in the subgraps for flowcharts.
2022-09-28 12:32:58 +02:00
Knut Sveidqvist
982c1b4979
#3061 Lazy loading auto derived path
2022-09-26 14:22:21 +02:00
Knut Sveidqvist
a928120bec
#3061 Log handing and other fixes, error handling in diagram creation
2022-09-26 10:44:18 +02:00
Knut Sveidqvist
9566f51ca8
Commiton issue #3061 Injecting mermaid utilities in registered diagram
2022-09-26 08:01:23 +02:00
Knut Sveidqvist
af2b1945a3
Detector registering itself on load
2022-09-23 16:55:30 +02:00
Sidharth Vinod
913468a7b5
Merge branch 'sidv/viteVitest' into sidv/3061_monorepo
...
* sidv/viteVitest:
fix: Core build
fix: js-base64
fix OutputOptions type
fix: js-base64
fix: json import, js-base64
fix: json import
2022-09-23 17:29:35 +05:30
Sidharth Vinod
8c63d002e7
fix: js-base64
...
Co-authored-by: Alois Klink <alois@aloisklink.com>
2022-09-23 16:53:11 +05:30
Sidharth Vinod
bc0be28f08
fix: js-base64
...
Co-authored-by: Alois Klink <alois@aloisklink.com>
2022-09-23 15:54:24 +05:30
Sidharth Vinod
eaa1602b1a
fix: json import, js-base64
...
Co-authored-by: Alois Klink <alois@aloisklink.com>
2022-09-23 15:42:41 +05:30
Sidharth Vinod
bf25be7cf0
Merge branch 'sidv/viteVitest' into sidv/3061_monorepo
...
* sidv/viteVitest:
ts conversion
cleanup
remove esbuild
fix: tests
chore: Add recommended extensions
Fix user-journey leaking css
Add "Debug Current Test File" configuration for VSCode
Fix unit test coverage
Use vite for build
Fix docs
vite
vite Server
Cleanup
Merge vitest & esbuild
Merge vitest
fix jison generation
Vite
Vite
2022-09-23 11:31:15 +05:30
Sidharth Vinod
9e35bf6e6f
fix: tests
2022-09-23 10:40:56 +05:30
Sidharth Vinod
aeb31fe1ae
Use vite for build
2022-09-22 15:35:22 +05:30
Knut Sveidqvist
0e0a6c0f69
Fixed paths for dev server
2022-09-22 11:28:37 +02:00
Sidharth Vinod
dab43da202
fix: imports in HTML
2022-09-20 22:13:49 +05:30
Ashish Jain
a266a9c539
Merge pull request #3479 from elliot-nelson/enelson/git-cherry-pick-tag
...
feat(git): cherry-pick keyword supports tag attribute
2022-09-20 17:38:01 +02:00
Knut Sveidqvist
7635db4c1e
Merge pull request #3454 from mermaid-js/3409_Truncated_Tags
...
3409 Fix for truncated tags in GitGraph
2022-09-19 08:28:41 +02:00
Elliot Nelson
4e4b5ccf8d
feat(git): allow cherry-pick to suppress tag altogether
2022-09-18 09:22:35 -04:00
Elliot Nelson
ae920eaa93
feat(git): cherry-pick keyword supports tag attribute
2022-09-17 23:57:32 -04:00
Alois Klink
e8eb2ab03f
Merge pull request #3459 from aloisklink/chore/update-cypress
...
Update Cypress to v10 and fix E2E errors
2022-09-16 17:32:10 +01:00
Knut Sveidqvist
9c88c785cb
Fix for issues in errorhandling and class diagrams after refactoring
2022-09-16 14:05:15 +02:00
ashishj
4c5d813e58
Fixed Linting issues
2022-09-16 09:25:22 +02:00
Sidharth Vinod
539ee49594
Merge remote-tracking branch 'origin/release/9.1.7' into sidv/mergeRelease
...
* origin/release/9.1.7:
Release 9.1.7
Fix for broken rendering test
Fix for issue #3428 , load the configured diagrams even when initialize has not been called.
2022-09-14 11:11:12 +05:30
Alois Klink
625ec813b9
chore: upgrade cypress to v10
...
Cypress v10 had some minor breaking changes,
(e.g. the cypress/plugins folder dissapeared)
so I had to change some things.
It looks like the Cypress was previously reverted in [dee9cfe
][1],
due to applitools not working properly,
but I think my changes fix this, so it should be okay.
[1]: dee9cfea85
2022-09-14 04:15:52 +01:00
Alois Klink
595f7680e9
fix(flowchart-v2): fix arrowMarkerAbsolute=true
...
The if-check for arrowMarkerAbsolute in the flowchart-v2 code is in
dagre-wrapper. Unfortunately, I can't seem to find a way to find the
local conf (e.g. the one set via `flowRenderer.setConf()`, so instead
I'm using global mermaid config from `src/config`.
Flowchart v1 arrowMarkerAbsolute=true is still broken, but I'm not
really sure how to fix that.
2022-09-14 04:15:52 +01:00
Alois Klink
6e7037bafd
test(e2e): fix most arrowMarkerAbsolute tests
...
The arrows between flowcharts do not have the class edgePath.
Instead, I'm loading all `<path>`s within the `<g class='edgePaths'>`
2022-09-14 04:15:52 +01:00
Alois Klink
a25c9a30d0
text(e2e): give git tests consistent commit id
...
gitGraph render tests are currently using random commit ids,
which causes visual regression tests to fail.
I couldn't find a way to make the random commit IDs consistent
(JavaScript/Cypress doesn't seem to have a random.seed() function),
so I've just hardcoded all the commit ids.
2022-09-14 04:15:52 +01:00
Alois Klink
05b8a6e77f
test(e2e): widen flowchart width to within 10%
...
Widen flowchart width acceptable values to within 10% of 300px.
On my local environment, I'm getting 283px, which is 5.5% of 300px.
2022-09-14 04:15:52 +01:00
Alois Klink
f05c790248
test(e2e): fix failing xss9 test
...
Fixes xx9 test to continue running even if JavaScript throws an
exception.
2022-09-14 04:15:52 +01:00
ashishj
d60ce53e05
#3409 Fixed the truncated tags issue
2022-09-13 18:23:24 +02:00
Knut Sveidqvist
fc9d22562b
Creating detectors and moving out diagram specific code from the diagramAPI
2022-09-10 15:53:50 +02:00
Sidharth Vinod
9d0901801b
Suppress errors
2022-09-09 18:26:57 +05:30
Knut Sveidqvist
47490e9820
Lint fixes
2022-09-05 15:57:12 +02:00
Knut Sveidqvist
df7b5965c2
Merge branch 'develop' into minmaps
2022-09-05 15:35:24 +02:00
Knut Sveidqvist
8ad5f728c0
Removing requirement to add ids for nodes with a shape
2022-09-05 14:53:01 +02:00
Knut Sveidqvist
8b4a08eef4
#3336 Merged typescript changes
2022-09-05 14:04:39 +02:00
Knut Sveidqvist
01106caa59
Merged typescript changes
2022-09-05 11:22:17 +02:00
Knut Sveidqvist
047b7023a2
Updated with cloud and bang shapes
2022-09-05 09:54:00 +02:00
Sidharth Vinod
98e9f5751a
Prettier pass
2022-09-05 01:00:47 +05:30
Sidharth Vinod
41dec4d159
Fix XSS htmls
2022-09-05 00:57:34 +05:30
Sidharth Vinod
91478caf5b
fix #3407 Replace `div` with `pre` and format
2022-09-05 00:48:36 +05:30
Knut Sveidqvist
5584fef1b0
#3395 Renabling the error graph which is rendered on error
2022-09-02 14:05:31 +02:00
Knut Sveidqvist
ccb16e5f5a
Adding cloud and bang shapes
2022-09-02 11:08:26 +02:00
Knut Sveidqvist
ac76fb73a8
Merge pull request #3360 from vallsv/feature-ms-duration
...
Feature decimal duration in second for gantt diagram
2022-09-01 16:23:42 +02:00
Knut Sveidqvist
68f8010ab9
Merge branch 'develop' into minmaps
2022-09-01 13:42:21 +02:00
Knut Sveidqvist
63c385a5d7
Adding some rendering tests
2022-08-30 21:36:17 +02:00
ashishj
a93f37a3fc
#3238 Updated documentation
2022-08-30 19:25:22 +02:00
ashishj
dd40b19c89
#3238 Added more rendering test cases
2022-08-30 18:37:13 +02:00
Ashish Jain
d7e0888801
Merge pull request #3361 from aloisklink/feature/3356_git_custom_merge_commit_id
...
feat(git): allow custom merge commit ids
2022-08-30 17:50:57 +02:00
Knut Sveidqvist
4cdc6e4a0d
Merge branch 'minmaps' of github.com:mermaid-js/mermaid into minmaps
2022-08-28 14:25:15 +02:00
Knut Sveidqvist
f350ff9852
Merge branch 'minmaps' of github.com:mermaid-js/mermaid into minmaps
2022-08-28 14:25:02 +02:00
Knut Sveidqvist
6ab0eef6f3
Merge branch 'develop'
...
Conflicts:
cypress/platform/knsv.html
2022-08-28 14:22:56 +02:00
Knut Sveidqvist
080bde0bc2
#2824 Updated regressionstest afters diagram sizing changes
2022-08-28 11:39:22 +02:00
Knut Sveidqvist
e6e7bdcb55
#2824 Size changes and updated regressionstest afters diagram sizing changes
2022-08-28 11:25:09 +02:00
Knut Sveidqvist
2968b400c4
Updated viewBox settings
2022-08-27 15:03:29 +02:00
Knut Sveidqvist
d0d5739ab0
Merge branch 'develop' into minmaps
2022-08-27 12:35:30 +02:00
Knut Sveidqvist
0779c39654
Border
2022-08-27 12:32:33 +02:00
Alois Klink
b2f5ba3ee8
feat(git): allow custom merge commit ids
...
Currently, merge commits can have a git tag, but they cannot have a
custom git commit ID.
This commit allows modifying the default merge commit id.
It also displays all merge commits IDs, which undoes
3ccf027f42
2022-08-25 23:42:39 +01:00
Valentin Valls
3315ae8382
Supports duration in decimal
2022-08-25 23:15:28 +02:00
Valentin Valls
0583c4fa25
Added 'ms' duration
2022-08-24 22:26:39 +02:00
Knut Sveidqvist
c50745323a
Merge pull request #3335 from FlorianWoelki/feature/3171_erDiagram_more_symbols
...
Add generic and array symbols to `erDiagram`
2022-08-23 20:07:06 +02:00
Knut Sveidqvist
280c7e8da1
#3243 Adding disabled testcase for diagram with leading \n
2022-08-21 11:05:13 +02:00
FlorianWoelki
19a9f90186
test(e2e): add array and generic attributes erDiagram test
2022-08-20 15:15:05 +02:00
Knut Sveidqvist
1befbe08ff
#3308 Allowing br tags in tooltips
2022-08-18 19:11:33 +02:00
Knut Sveidqvist
bf4272102d
#3313 Packaging the thrown error in reconised structure
2022-08-11 18:24:14 +02:00
Knut Sveidqvist
d32c8534cb
Bugfix for empty blank lines
2022-08-09 18:39:20 +02:00
Knut Sveidqvist
9b54feab84
Merge branch 'develop' into minmaps
2022-08-06 10:53:54 +02:00
Knut Sveidqvist
afe343e94f
Changes after merge
2022-08-06 10:49:32 +02:00
ashishj
0ab152d644
Updated the integration test selectors
2022-08-04 19:40:51 +02:00
Knut Sveidqvist
e6b410af04
Selector fixes for interaction tests
2022-08-04 19:26:34 +02:00
Knut Sveidqvist
b0074bf723
Merge pull request #3222 from leon19/bugfix/incorrect-label-padding
...
fix: remove right padding when a label contains HTML entities
2022-08-04 13:06:46 +02:00
Knut Sveidqvist
aa9149912d
Merge branch 'bug/3011_multiline_alignment' of github.com:hype09/mermaid into hype09-bug/3011_multiline_alignment
2022-08-04 13:05:17 +02:00
Muhammad Faisal Bin Arba'in
9ee43c0b7a
snapshot test for more 8 branches with commits
2022-08-01 19:41:54 +08:00
Knut Sveidqvist
ffe520db06
Curved edges
2022-07-29 15:06:21 +02:00
Knut Sveidqvist
00fe5d477d
Different hanlding of icons for circles
2022-07-28 20:38:25 +02:00
Knut Sveidqvist
1a205aeccc
Adding icon support
2022-07-27 18:40:44 +02:00
Knut Sveidqvist
82a480d924
Adding circle node type and class handling
2022-07-27 17:25:20 +02:00
Knut Sveidqvist
2d361964ce
Better padding handling in nodes
2022-07-27 10:24:27 +02:00
Knut Sveidqvist
03d71829c6
Adding default node form
2022-07-27 09:43:25 +02:00
Lorens León
c40368b0fa
fix: remove right padding when a label contains HTML entities
...
Decode the HTML entities from the label text before adding them to the
HTML this prevents a miss-calculation of the label text length
2022-07-26 21:50:36 +02:00
Knut Sveidqvist
0b2ca29ae8
Theme support for mindmaps
2022-07-25 17:03:18 +02:00
Knut Sveidqvist
f815bd08b7
Adjusting the width of the boxes based on the text in the boxes
2022-07-25 14:22:07 +02:00
Knut Sveidqvist
15f1cdf3aa
Draft of edge rendering
2022-07-24 17:45:54 +02:00
Knut Sveidqvist
8e5e212c49
Layout algorithm in place
2022-07-24 11:05:54 +02:00
Knut Sveidqvist
7de68f0bf2
Adding text wrap and logic for placing nodes in the svg
2022-07-23 10:16:54 +02:00
Knut Sveidqvist
8681e78e50
Fixes for rendering tests
2022-07-20 14:39:01 +02:00
Knut Sveidqvist
27cf50044d
Merge branch 'develop' of github.com:mermaid-js/mermaid into develop
2022-07-20 11:32:38 +02:00
Knut Sveidqvist
dee9cfea85
Reverting to cypress 9.7 in order to get applitools back in the game
2022-07-20 11:32:21 +02:00
Knut Sveidqvist
4c30e03f1e
Using diagram api to add gitGraph
2022-07-18 16:00:03 +02:00
Knut Sveidqvist
0d4b09a0a0
Handle legacy state diagram and start using Generic diagram in mermaidAPI
2022-07-04 22:55:11 +02:00
Knut Sveidqvist
408c08d2a3
Fix for v2 class diagram
2022-07-04 22:41:09 +02:00
Knut Sveidqvist
10f56129c1
Fix for legacy class diagram
2022-07-04 19:37:56 +02:00
Knut Sveidqvist
bc6830cbdb
Handling of requirement diagrams using the generic diagram
2022-07-04 18:50:50 +02:00
Knut Sveidqvist
682a1404ca
Fixes for erDiagram, pie charts and journey diagram
2022-07-04 18:11:58 +02:00
Knut Sveidqvist
5318ec6dbf
Handling gantt and flowchart-v2
2022-07-04 15:33:39 +02:00
Knut Sveidqvist
1675174b2a
Fix for flowcharts
2022-07-04 12:37:50 +02:00
Knut Sveidqvist
023781716f
Git graph, example
2022-07-04 11:43:48 +02:00
Knut Sveidqvist
bedc9399c5
Updating c4 and sequence
2022-07-04 11:29:38 +02:00
Paik Paustian
ed29fe1aa9
Fix #3011 : Support left- and right-alignment for multi-line messages and notes
...
Previously, messages and notes that had multiple lines (via `<br>`-tags) were only displayed correctly
when using the default `center` value for the `messageAlign` and `noteAlign` configuration options.
Using `left` or `right` for the alignment options caused the text to collapse and become illegible,
as outlined in issue #3011 .
This comes as a side-effect from how the internal `valign` text-rendering option was configured for
messages and notes:
```js
// Example from `sequenceRenderer.js: drawMessage()`
textObj.anchor = conf.messageAlign;
textObj.valign = conf.messageAlign;
```
Both the `anchor` option (which controls left-right alignment) and the `valign` option (which controls
vertical top-down placement) were set to the same value, the user-provided `messageAlign` config option.
While `left` and `right` are valid values for the `anchor` option, they were effectively no-ops for the
`valign` option, which only supports `top`, `start`, `middle`, `center`, `bottom`, and `end`.
To fix the issue, the `valign` property is now always set to `center` for notes and messages.
Similarly, the `dominantBaseline` option of texts is now always set to `middle`, rather than setting it to
either `text-{before,after}-edge`, which caused left-aligned multi-line text to always be "top-left" aligned
inside a note (or "bottom-right" when attempting to right-align).
Now, texts in messages and notes are always vertically centered and alignment options correctly apply for
both single and multi-line content.
2022-07-03 11:59:57 +02:00
ashishj
1dfddfde54
Merge branch 'release/9.1.3' into 3061_refactoring_and_modularisation
2022-06-28 20:12:03 +02:00
Ashish Jain
259abb081a
Merge pull request #3176 from yutotnh/fix-typo
...
Fix typo
2022-06-28 19:01:35 +02:00
yutotnh
5619b54cdb
fix: typo in cypress
2022-06-27 12:29:50 +09:00
Knut Sveidqvist
8484d55a6a
Fix fir tests
2022-06-26 21:30:49 +02:00
Knut Sveidqvist
610f154c74
Sanitizsation of incoming variables that are added to the userStyles
2022-06-21 21:46:37 +02:00
Knut Sveidqvist
ec2da8e85d
Only allowing a subset of characters in themeVariables
2022-06-21 21:17:53 +02:00
Sidharth Vinod
79a42772b9
Merge pull request #3135 from mermaid-js/dependabot/npm_and_yarn/develop/cypress-10.1.0
...
chore(deps-dev): bump cypress from 9.7.0 to 10.1.0
2022-06-20 11:08:55 +05:30
MOREL Matthieu
648b15b00b
Upgrade Cypress
2022-06-19 14:36:54 +02:00
Knut Sveidqvist
69b7b0e029
Fix for padding issue and some cleanup
2022-06-14 20:09:55 +02:00
Knut Sveidqvist
3fd9cabd43
Test file
2022-06-14 18:42:00 +02:00
Knut Sveidqvist
5d30d46535
Merge pull request #3118 from mermaid-js/3116_paddings
...
Handle diagram paddings in a consistent way
2022-06-08 20:24:18 +02:00
Knut Sveidqvist
4dd3d3bc76
2022-06-08 20:17:31 +02:00
ashishj
e3df38e078
#3080 Added more rendering test for cherry pick functionality
2022-06-07 20:52:52 +02:00
ashishj
c147404d1c
#3080 Added support for cherry pick commits
2022-06-07 20:32:43 +02:00
ashishj
90d187c48a
#3080 Added rendering test cases
2022-06-07 18:52:38 +02:00
Andreas Deininger
8e157423e0
Fixing various typos
...
Changing links from http to https
2022-06-01 12:06:53 +02:00
Knut Sveidqvist
bd459fadd3
2022-05-31 20:35:44 +02:00
Knut Sveidqvist
bb5baa65cb
Merge branch 'develop' of github.com:mermaid-js/mermaid into develop
2022-05-31 17:11:29 +02:00
Knut Sveidqvist
ee61a26faf
Merge pull request #3063 from financelurker/feature/3062_critical_region_and_break_in_sequence_diagrams
...
feat: adding "Critical Region"/"Option" and "Break" blocks to sequence diagram
2022-05-31 17:11:03 +02:00
Knut Sveidqvist
66f2f42294
Selecting the correct title for gantt charts
2022-05-24 20:10:04 +02:00
Knut Sveidqvist
b82b2d2b78
#3074 Using regular title as a fallback for the accessibility title when no dedicated accessibility title is present
2022-05-24 18:52:37 +02:00
Knut Sveidqvist
6eef26f107
#3074 Fix for tests
2022-05-24 18:33:13 +02:00