8c63d002e7
fix: js-base64
...
Co-authored-by: Alois Klink <alois@aloisklink.com>
2022-09-23 16:53:11 +05:30
bc0be28f08
fix: js-base64
...
Co-authored-by: Alois Klink <alois@aloisklink.com>
2022-09-23 15:54:24 +05:30
eaa1602b1a
fix: json import, js-base64
...
Co-authored-by: Alois Klink <alois@aloisklink.com>
2022-09-23 15:42:41 +05:30
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
9e35bf6e6f
fix: tests
2022-09-23 10:40:56 +05:30
aeb31fe1ae
Use vite for build
2022-09-22 15:35:22 +05:30
0e0a6c0f69
Fixed paths for dev server
2022-09-22 11:28:37 +02:00
dab43da202
fix: imports in HTML
2022-09-20 22:13:49 +05:30
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
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
4e4b5ccf8d
feat(git): allow cherry-pick to suppress tag altogether
2022-09-18 09:22:35 -04:00
ae920eaa93
feat(git): cherry-pick keyword supports tag attribute
2022-09-17 23:57:32 -04:00
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
9c88c785cb
Fix for issues in errorhandling and class diagrams after refactoring
2022-09-16 14:05:15 +02:00
4c5d813e58
Fixed Linting issues
2022-09-16 09:25:22 +02:00
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
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 [dee9cfedee9cfea85
2022-09-14 04:15:52 +01:00
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
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
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
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
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
d60ce53e05
#3409 Fixed the truncated tags issue
2022-09-13 18:23:24 +02:00
fc9d22562b
Creating detectors and moving out diagram specific code from the diagramAPI
2022-09-10 15:53:50 +02:00
9d0901801b
Suppress errors
2022-09-09 18:26:57 +05:30
47490e9820
Lint fixes
2022-09-05 15:57:12 +02:00
df7b5965c2
Merge branch 'develop' into minmaps
2022-09-05 15:35:24 +02:00
8ad5f728c0
Removing requirement to add ids for nodes with a shape
2022-09-05 14:53:01 +02:00
8b4a08eef4
#3336 Merged typescript changes
2022-09-05 14:04:39 +02:00
01106caa59
Merged typescript changes
2022-09-05 11:22:17 +02:00
047b7023a2
Updated with cloud and bang shapes
2022-09-05 09:54:00 +02:00
98e9f5751a
Prettier pass
2022-09-05 01:00:47 +05:30
41dec4d159
Fix XSS htmls
2022-09-05 00:57:34 +05:30
91478caf5b
fix #3407 Replace `div` with `pre` and format
2022-09-05 00:48:36 +05:30
5584fef1b0
#3395 Renabling the error graph which is rendered on error
2022-09-02 14:05:31 +02:00
ccb16e5f5a
Adding cloud and bang shapes
2022-09-02 11:08:26 +02:00
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
68f8010ab9
Merge branch 'develop' into minmaps
2022-09-01 13:42:21 +02:00
63c385a5d7
Adding some rendering tests
2022-08-30 21:36:17 +02:00
a93f37a3fc
#3238 Updated documentation
2022-08-30 19:25:22 +02:00
dd40b19c89
#3238 Added more rendering test cases
2022-08-30 18:37:13 +02:00
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
4cdc6e4a0d
Merge branch 'minmaps' of github.com:mermaid-js/mermaid into minmaps
2022-08-28 14:25:15 +02:00
f350ff9852
Merge branch 'minmaps' of github.com:mermaid-js/mermaid into minmaps
2022-08-28 14:25:02 +02:00
6ab0eef6f3
Merge branch 'develop'
...
Conflicts:
cypress/platform/knsv.html
2022-08-28 14:22:56 +02:00
080bde0bc2
#2824 Updated regressionstest afters diagram sizing changes
2022-08-28 11:39:22 +02:00
e6e7bdcb55
#2824 Size changes and updated regressionstest afters diagram sizing changes
2022-08-28 11:25:09 +02:00
2968b400c4
Updated viewBox settings
2022-08-27 15:03:29 +02:00
d0d5739ab0
Merge branch 'develop' into minmaps
2022-08-27 12:35:30 +02:00
0779c39654
Border
2022-08-27 12:32:33 +02:00
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
3315ae8382
Supports duration in decimal
2022-08-25 23:15:28 +02:00
0583c4fa25
Added 'ms' duration
2022-08-24 22:26:39 +02:00
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
280c7e8da1
#3243 Adding disabled testcase for diagram with leading \n
2022-08-21 11:05:13 +02:00
19a9f90186
test(e2e): add array and generic attributes erDiagram test
2022-08-20 15:15:05 +02:00
1befbe08ff
#3308 Allowing br tags in tooltips
2022-08-18 19:11:33 +02:00
bf4272102d
#3313 Packaging the thrown error in reconised structure
2022-08-11 18:24:14 +02:00
d32c8534cb
Bugfix for empty blank lines
2022-08-09 18:39:20 +02:00
9b54feab84
Merge branch 'develop' into minmaps
2022-08-06 10:53:54 +02:00
afe343e94f
Changes after merge
2022-08-06 10:49:32 +02:00
0ab152d644
Updated the integration test selectors
2022-08-04 19:40:51 +02:00
e6b410af04
Selector fixes for interaction tests
2022-08-04 19:26:34 +02:00
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
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
9ee43c0b7a
snapshot test for more 8 branches with commits
2022-08-01 19:41:54 +08:00
ffe520db06
Curved edges
2022-07-29 15:06:21 +02:00
00fe5d477d
Different hanlding of icons for circles
2022-07-28 20:38:25 +02:00
1a205aeccc
Adding icon support
2022-07-27 18:40:44 +02:00
82a480d924
Adding circle node type and class handling
2022-07-27 17:25:20 +02:00
2d361964ce
Better padding handling in nodes
2022-07-27 10:24:27 +02:00
03d71829c6
Adding default node form
2022-07-27 09:43:25 +02:00
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
0b2ca29ae8
Theme support for mindmaps
2022-07-25 17:03:18 +02:00
f815bd08b7
Adjusting the width of the boxes based on the text in the boxes
2022-07-25 14:22:07 +02:00
15f1cdf3aa
Draft of edge rendering
2022-07-24 17:45:54 +02:00
8e5e212c49
Layout algorithm in place
2022-07-24 11:05:54 +02:00
7de68f0bf2
Adding text wrap and logic for placing nodes in the svg
2022-07-23 10:16:54 +02:00
8681e78e50
Fixes for rendering tests
2022-07-20 14:39:01 +02:00
27cf50044d
Merge branch 'develop' of github.com:mermaid-js/mermaid into develop
2022-07-20 11:32:38 +02:00
dee9cfea85
Reverting to cypress 9.7 in order to get applitools back in the game
2022-07-20 11:32:21 +02:00
4c30e03f1e
Using diagram api to add gitGraph
2022-07-18 16:00:03 +02:00
0d4b09a0a0
Handle legacy state diagram and start using Generic diagram in mermaidAPI
2022-07-04 22:55:11 +02:00
408c08d2a3
Fix for v2 class diagram
2022-07-04 22:41:09 +02:00
10f56129c1
Fix for legacy class diagram
2022-07-04 19:37:56 +02:00
bc6830cbdb
Handling of requirement diagrams using the generic diagram
2022-07-04 18:50:50 +02:00
682a1404ca
Fixes for erDiagram, pie charts and journey diagram
2022-07-04 18:11:58 +02:00
5318ec6dbf
Handling gantt and flowchart-v2
2022-07-04 15:33:39 +02:00
1675174b2a
Fix for flowcharts
2022-07-04 12:37:50 +02:00
023781716f
Git graph, example
2022-07-04 11:43:48 +02:00
bedc9399c5
Updating c4 and sequence
2022-07-04 11:29:38 +02:00
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
1dfddfde54
Merge branch 'release/9.1.3' into 3061_refactoring_and_modularisation
2022-06-28 20:12:03 +02:00
259abb081a
Merge pull request #3176 from yutotnh/fix-typo
...
Fix typo
2022-06-28 19:01:35 +02:00
5619b54cdb
fix: typo in cypress
2022-06-27 12:29:50 +09:00
8484d55a6a
Fix fir tests
2022-06-26 21:30:49 +02:00
610f154c74
Sanitizsation of incoming variables that are added to the userStyles
2022-06-21 21:46:37 +02:00
ec2da8e85d
Only allowing a subset of characters in themeVariables
2022-06-21 21:17:53 +02:00
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
648b15b00b
Upgrade Cypress
2022-06-19 14:36:54 +02:00
69b7b0e029
Fix for padding issue and some cleanup
2022-06-14 20:09:55 +02:00
3fd9cabd43
Test file
2022-06-14 18:42:00 +02:00
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
4dd3d3bc76
2022-06-08 20:17:31 +02:00
e3df38e078
#3080 Added more rendering test for cherry pick functionality
2022-06-07 20:52:52 +02:00
c147404d1c
#3080 Added support for cherry pick commits
2022-06-07 20:32:43 +02:00
90d187c48a
#3080 Added rendering test cases
2022-06-07 18:52:38 +02:00
8e157423e0
Fixing various typos
...
Changing links from http to https
2022-06-01 12:06:53 +02:00
bd459fadd3
2022-05-31 20:35:44 +02:00
bb5baa65cb
Merge branch 'develop' of github.com:mermaid-js/mermaid into develop
2022-05-31 17:11:29 +02:00
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
66f2f42294
Selecting the correct title for gantt charts
2022-05-24 20:10:04 +02:00
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
6eef26f107
#3074 Fix for tests
2022-05-24 18:33:13 +02:00
2ab1e162ea
#3074 Cleanup and fixes for issues with accessibility for gantt and journey diagrams
2022-05-24 18:20:05 +02:00
7372ca5e8e
Adding "Critical Region" and "Break" blocks
2022-05-21 09:31:06 +02:00
85062ac570
#3046 Add support for cyclic themeVariable rotation for more than 8 branches
2022-05-17 19:15:50 +02:00
b7b02fcc2c
chore: rm cypress ex. and prevent dup ci
2022-05-10 17:29:50 -07:00
eadbf595ba
Adding applitools to inegration tests
2022-05-10 20:33:55 +02:00
5ec5ebf94b
#2951 Fix for styling issue on labes when using htmlLabels in legacy flowcharts
2022-05-10 17:45:16 +02:00
65143a0182
#2732 Regression fixes for accessibility
2022-05-06 19:42:40 +02:00
d8682cfb5f
#2732 rendering the title and descr fields for the gitGraph
2022-05-06 17:40:40 +02:00
e917347b81
Removing logging, cleanup
2022-04-30 15:54:03 +02:00
bada661bd0
Merge branch 'develop' of github.com:mermaid-js/mermaid into develop
2022-04-28 18:45:22 +02:00
d914e23626
Fix for hideUnusedParticipants
2022-04-28 18:45:18 +02:00
c58a04bc94
Fix broken configuration spec test
2022-04-28 18:26:50 +02:00
5aac0734d5
Fix for broken Requirement diagram cypress test
2022-04-28 18:26:31 +02:00
386f3c7ce9
Merge branch 'develop' into feature/hideUnusedParticipants_1210
2022-04-28 17:38:48 +02:00
c0bdf9d99b
Merge pull request #2958 from mermaid-js/decode_entities_update
...
Removal of vulnerability
2022-04-21 21:25:08 +02:00
df87ab8818
Fix for vulnerability
2022-04-21 21:11:48 +02:00
4c93870580
feat: add hideUnusedParticipants and some cleanup
2022-04-14 19:19:18 -07:00
7d2e77a1b3
Merge pull request #2915 from gwincr11/cg-req-access
...
feat: Add accessibility fields to requirements diagram
2022-04-12 07:19:40 +02:00
266bce45f2
Merge pull request #2912 from el-mapache/feat/gantt-diagram-accessibility
...
Adds accDescription to Gantt, draws tags to svg
2022-04-12 07:06:41 +02:00
8b29fbe98e
Updating Gitgraph docs
2022-04-07 20:13:15 +02:00
3d7cb212c0
feat: Add accessibility fields to requirements diagram
2022-04-07 18:02:48 +00:00
87b56bdd9a
#1252 Adding confuration options and some cleanup, swicth of graphType from git to gitGraph
2022-04-07 18:22:06 +02:00
65b0b83625
Adds accDescription, draws tags to svg
2022-04-07 10:05:54 -04:00
bbac11a4b8
Updated rendering test with fixed id
2022-03-31 19:49:42 +02:00
12c63ff007
Finalizing GitGraph with directives, theming & docs
2022-03-31 19:37:36 +02:00
f6421734a2
Merge branch 'develop' into 1252_gitgraph_reinvented
2022-03-31 19:16:31 +02:00
fca58aafb1
Test updates when switching to cypress-image-snapshoits
2022-03-31 19:14:37 +02:00
3c0a2f0fd0
chore: replacing percy with cypress-image-snapshots
2022-03-31 18:06:04 +02:00
22aca7b3ee
#1252 Adding background on commit labels
2022-03-25 08:56:22 +01:00
3ee141ff9b
Added Gitgraph docs
2022-03-24 20:28:30 +01:00
c0335cf5fb
#1252 Adding support for tags
2022-03-24 20:25:22 +01:00
b9bde5e64c
Fixed more example cases
2022-03-24 17:43:23 +01:00
4eb7d0d299
Update the gitgraph example
2022-03-24 17:32:50 +01:00
4023be1e84
Merge branch '1252_gitgraph_reinvented' of github.com:mermaid-js/mermaid into 1252_gitgraph_reinvented
2022-03-17 20:07:30 +01:00
b78b371025
Added theming support for gitgraph
2022-03-17 20:07:27 +01:00
a7c33b7d5a
Replacing master to main in test cases
2022-03-17 19:19:25 +01:00
Sidharth Vinod