From 5deb9b2d7ddd08cb09a8b4ef14f371249b2f9351 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Mon, 5 Dec 2022 11:22:16 -0800 Subject: [PATCH 1/3] blend groups --- d2exporter/export.go | 4 + d2layouts/d2sequence/constants.go | 6 +- d2renderers/d2svg/d2svg.go | 7 +- d2renderers/d2svg/style.css | 4 + d2target/d2target.go | 4 + .../sanity/1_to_2/dagre/board.exp.json | 3 + .../sanity/1_to_2/dagre/sketch.exp.svg | 4 + .../testdata/sanity/1_to_2/elk/board.exp.json | 3 + .../testdata/sanity/1_to_2/elk/sketch.exp.svg | 4 + .../sanity/basic/dagre/board.exp.json | 2 + .../sanity/basic/dagre/sketch.exp.svg | 4 + .../testdata/sanity/basic/elk/board.exp.json | 2 + .../testdata/sanity/basic/elk/sketch.exp.svg | 4 + .../child_to_child/dagre/board.exp.json | 4 + .../child_to_child/dagre/sketch.exp.svg | 4 + .../sanity/child_to_child/elk/board.exp.json | 4 + .../sanity/child_to_child/elk/sketch.exp.svg | 4 + .../connection_label/dagre/board.exp.json | 2 + .../connection_label/dagre/sketch.exp.svg | 4 + .../connection_label/elk/board.exp.json | 2 + .../connection_label/elk/sketch.exp.svg | 4 + .../sanity/empty/dagre/sketch.exp.svg | 4 + .../testdata/sanity/empty/elk/sketch.exp.svg | 4 + .../stable/all_shapes/dagre/board.exp.json | 17 ++ .../stable/all_shapes/dagre/sketch.exp.svg | 4 + .../stable/all_shapes/elk/board.exp.json | 17 ++ .../stable/all_shapes/elk/sketch.exp.svg | 4 + .../all_shapes_multiple/dagre/board.exp.json | 17 ++ .../all_shapes_multiple/dagre/sketch.exp.svg | 4 + .../all_shapes_multiple/elk/board.exp.json | 17 ++ .../all_shapes_multiple/elk/sketch.exp.svg | 4 + .../all_shapes_shadow/dagre/board.exp.json | 17 ++ .../all_shapes_shadow/dagre/sketch.exp.svg | 4 + .../all_shapes_shadow/elk/board.exp.json | 17 ++ .../all_shapes_shadow/elk/sketch.exp.svg | 4 + .../arrowhead_adjustment/dagre/board.exp.json | 4 + .../arrowhead_adjustment/dagre/sketch.exp.svg | 4 + .../arrowhead_adjustment/elk/board.exp.json | 4 + .../arrowhead_adjustment/elk/sketch.exp.svg | 4 + .../arrowhead_labels/dagre/board.exp.json | 2 + .../arrowhead_labels/dagre/sketch.exp.svg | 4 + .../arrowhead_labels/elk/board.exp.json | 2 + .../arrowhead_labels/elk/sketch.exp.svg | 4 + .../stable/binary_tree/dagre/board.exp.json | 15 ++ .../stable/binary_tree/dagre/sketch.exp.svg | 4 + .../stable/binary_tree/elk/board.exp.json | 15 ++ .../stable/binary_tree/elk/sketch.exp.svg | 4 + .../stable/chaos1/dagre/board.exp.json | 5 + .../stable/chaos1/dagre/sketch.exp.svg | 4 + .../testdata/stable/chaos1/elk/board.exp.json | 5 + .../testdata/stable/chaos1/elk/sketch.exp.svg | 4 + .../stable/chaos2/dagre/board.exp.json | 15 ++ .../stable/chaos2/dagre/sketch.exp.svg | 4 + .../testdata/stable/chaos2/elk/board.exp.json | 15 ++ .../testdata/stable/chaos2/elk/sketch.exp.svg | 4 + .../child_parent_edges/dagre/board.exp.json | 4 + .../child_parent_edges/dagre/sketch.exp.svg | 4 + .../child_parent_edges/elk/board.exp.json | 4 + .../child_parent_edges/elk/sketch.exp.svg | 4 + .../circular_dependency/dagre/board.exp.json | 3 + .../circular_dependency/dagre/sketch.exp.svg | 4 + .../circular_dependency/elk/board.exp.json | 3 + .../circular_dependency/elk/sketch.exp.svg | 4 + .../stable/class/dagre/board.exp.json | 1 + .../stable/class/dagre/sketch.exp.svg | 4 + .../testdata/stable/class/elk/board.exp.json | 1 + .../testdata/stable/class/elk/sketch.exp.svg | 4 + .../stable/code_snippet/dagre/board.exp.json | 3 + .../stable/code_snippet/dagre/sketch.exp.svg | 4 + .../stable/code_snippet/elk/board.exp.json | 3 + .../stable/code_snippet/elk/sketch.exp.svg | 4 + .../connected_container/dagre/board.exp.json | 7 + .../connected_container/dagre/sketch.exp.svg | 4 + .../connected_container/elk/board.exp.json | 7 + .../connected_container/elk/sketch.exp.svg | 4 + .../container_edges/dagre/board.exp.json | 8 + .../container_edges/dagre/sketch.exp.svg | 4 + .../stable/container_edges/elk/board.exp.json | 8 + .../stable/container_edges/elk/sketch.exp.svg | 4 + .../stable/dense/dagre/board.exp.json | 17 ++ .../stable/dense/dagre/sketch.exp.svg | 4 + .../testdata/stable/dense/elk/board.exp.json | 17 ++ .../testdata/stable/dense/elk/sketch.exp.svg | 4 + .../different_subgraphs/dagre/board.exp.json | 22 +++ .../different_subgraphs/dagre/sketch.exp.svg | 4 + .../different_subgraphs/elk/board.exp.json | 22 +++ .../different_subgraphs/elk/sketch.exp.svg | 4 + .../stable/direction/dagre/board.exp.json | 15 ++ .../stable/direction/dagre/sketch.exp.svg | 4 + .../stable/direction/elk/board.exp.json | 15 ++ .../stable/direction/elk/sketch.exp.svg | 4 + .../stable/font_colors/dagre/board.exp.json | 2 + .../stable/font_colors/dagre/sketch.exp.svg | 4 + .../stable/font_colors/elk/board.exp.json | 2 + .../stable/font_colors/elk/sketch.exp.svg | 4 + .../stable/font_sizes/dagre/board.exp.json | 12 ++ .../stable/font_sizes/dagre/sketch.exp.svg | 4 + .../stable/font_sizes/elk/board.exp.json | 12 ++ .../stable/font_sizes/elk/sketch.exp.svg | 4 + .../giant_markdown_test/dagre/board.exp.json | 3 + .../giant_markdown_test/dagre/sketch.exp.svg | 4 + .../giant_markdown_test/elk/board.exp.json | 3 + .../giant_markdown_test/elk/sketch.exp.svg | 4 + .../testdata/stable/hr/dagre/board.exp.json | 3 + .../testdata/stable/hr/dagre/sketch.exp.svg | 4 + .../testdata/stable/hr/elk/board.exp.json | 3 + .../testdata/stable/hr/elk/sketch.exp.svg | 4 + .../stable/icon-label/dagre/board.exp.json | 1 + .../stable/icon-label/dagre/sketch.exp.svg | 4 + .../stable/icon-label/elk/board.exp.json | 1 + .../stable/icon-label/elk/sketch.exp.svg | 4 + .../stable/images/dagre/board.exp.json | 2 + .../stable/images/dagre/sketch.exp.svg | 4 + .../testdata/stable/images/elk/board.exp.json | 2 + .../testdata/stable/images/elk/sketch.exp.svg | 4 + .../stable/investigate/dagre/board.exp.json | 31 +++ .../stable/investigate/dagre/sketch.exp.svg | 4 + .../stable/investigate/elk/board.exp.json | 31 +++ .../stable/investigate/elk/sketch.exp.svg | 4 + .../stable/large_arch/dagre/board.exp.json | 33 ++++ .../stable/large_arch/dagre/sketch.exp.svg | 4 + .../stable/large_arch/elk/board.exp.json | 33 ++++ .../stable/large_arch/elk/sketch.exp.svg | 4 + .../stable/latex/dagre/board.exp.json | 6 + .../stable/latex/dagre/sketch.exp.svg | 4 + .../testdata/stable/latex/elk/board.exp.json | 6 + .../testdata/stable/latex/elk/sketch.exp.svg | 4 + .../testdata/stable/li1/dagre/board.exp.json | 3 + .../testdata/stable/li1/dagre/sketch.exp.svg | 4 + .../testdata/stable/li1/elk/board.exp.json | 3 + .../testdata/stable/li1/elk/sketch.exp.svg | 4 + .../testdata/stable/li2/dagre/board.exp.json | 3 + .../testdata/stable/li2/dagre/sketch.exp.svg | 4 + .../testdata/stable/li2/elk/board.exp.json | 3 + .../testdata/stable/li2/elk/sketch.exp.svg | 4 + .../testdata/stable/li3/dagre/board.exp.json | 3 + .../testdata/stable/li3/dagre/sketch.exp.svg | 4 + .../testdata/stable/li3/elk/board.exp.json | 3 + .../testdata/stable/li3/elk/sketch.exp.svg | 4 + .../testdata/stable/li4/dagre/board.exp.json | 3 + .../testdata/stable/li4/dagre/sketch.exp.svg | 4 + .../testdata/stable/li4/elk/board.exp.json | 3 + .../testdata/stable/li4/elk/sketch.exp.svg | 4 + .../stable/lone_h1/dagre/board.exp.json | 3 + .../stable/lone_h1/dagre/sketch.exp.svg | 4 + .../stable/lone_h1/elk/board.exp.json | 3 + .../stable/lone_h1/elk/sketch.exp.svg | 4 + .../stable/markdown/dagre/board.exp.json | 3 + .../stable/markdown/dagre/sketch.exp.svg | 4 + .../stable/markdown/elk/board.exp.json | 3 + .../stable/markdown/elk/sketch.exp.svg | 4 + .../md_2space_newline/dagre/board.exp.json | 2 + .../md_2space_newline/dagre/sketch.exp.svg | 4 + .../md_2space_newline/elk/board.exp.json | 2 + .../md_2space_newline/elk/sketch.exp.svg | 4 + .../md_backslash_newline/dagre/board.exp.json | 2 + .../md_backslash_newline/dagre/sketch.exp.svg | 4 + .../md_backslash_newline/elk/board.exp.json | 2 + .../md_backslash_newline/elk/sketch.exp.svg | 4 + .../md_code_block_fenced/dagre/board.exp.json | 3 + .../md_code_block_fenced/dagre/sketch.exp.svg | 4 + .../md_code_block_fenced/elk/board.exp.json | 3 + .../md_code_block_fenced/elk/sketch.exp.svg | 4 + .../dagre/board.exp.json | 3 + .../dagre/sketch.exp.svg | 4 + .../md_code_block_indented/elk/board.exp.json | 3 + .../md_code_block_indented/elk/sketch.exp.svg | 4 + .../md_code_inline/dagre/board.exp.json | 3 + .../md_code_inline/dagre/sketch.exp.svg | 4 + .../stable/md_code_inline/elk/board.exp.json | 3 + .../stable/md_code_inline/elk/sketch.exp.svg | 4 + .../multiline_text/dagre/board.exp.json | 1 + .../multiline_text/dagre/sketch.exp.svg | 4 + .../stable/multiline_text/elk/board.exp.json | 1 + .../stable/multiline_text/elk/sketch.exp.svg | 4 + .../multiple_trees/dagre/board.exp.json | 23 +++ .../multiple_trees/dagre/sketch.exp.svg | 4 + .../stable/multiple_trees/elk/board.exp.json | 23 +++ .../stable/multiple_trees/elk/sketch.exp.svg | 4 + .../stable/n22_e32/dagre/board.exp.json | 21 +++ .../stable/n22_e32/dagre/sketch.exp.svg | 4 + .../stable/n22_e32/elk/board.exp.json | 21 +++ .../stable/n22_e32/elk/sketch.exp.svg | 4 + .../number_connections/dagre/board.exp.json | 4 + .../number_connections/dagre/sketch.exp.svg | 4 + .../number_connections/elk/board.exp.json | 4 + .../number_connections/elk/sketch.exp.svg | 4 + .../one_container_loop/dagre/board.exp.json | 8 + .../one_container_loop/dagre/sketch.exp.svg | 4 + .../one_container_loop/elk/board.exp.json | 8 + .../one_container_loop/elk/sketch.exp.svg | 4 + .../dagre/board.exp.json | 7 + .../dagre/sketch.exp.svg | 4 + .../elk/board.exp.json | 7 + .../elk/sketch.exp.svg | 4 + .../testdata/stable/p/dagre/board.exp.json | 3 + .../testdata/stable/p/dagre/sketch.exp.svg | 4 + e2etests/testdata/stable/p/elk/board.exp.json | 3 + e2etests/testdata/stable/p/elk/sketch.exp.svg | 4 + .../testdata/stable/pre/dagre/board.exp.json | 3 + .../testdata/stable/pre/dagre/sketch.exp.svg | 4 + .../testdata/stable/pre/elk/board.exp.json | 3 + .../testdata/stable/pre/elk/sketch.exp.svg | 4 + .../self-referencing/dagre/board.exp.json | 3 + .../self-referencing/dagre/sketch.exp.svg | 4 + .../self-referencing/elk/board.exp.json | 3 + .../self-referencing/elk/sketch.exp.svg | 4 + .../dagre/board.exp.json | 60 ++++-- .../dagre/sketch.exp.svg | 4 + .../elk/board.exp.json | 60 ++++-- .../elk/sketch.exp.svg | 4 + .../dagre/board.exp.json | 38 ++-- .../dagre/sketch.exp.svg | 6 +- .../elk/board.exp.json | 38 ++-- .../elk/sketch.exp.svg | 6 +- .../dagre/board.exp.json | 69 ++++--- .../dagre/sketch.exp.svg | 4 + .../elk/board.exp.json | 69 ++++--- .../elk/sketch.exp.svg | 4 + .../dagre/board.exp.json | 16 +- .../dagre/sketch.exp.svg | 6 +- .../sequence_diagram_note/elk/board.exp.json | 16 +- .../sequence_diagram_note/elk/sketch.exp.svg | 6 +- .../dagre/board.exp.json | 38 ++-- .../dagre/sketch.exp.svg | 6 +- .../sequence_diagram_real/elk/board.exp.json | 38 ++-- .../sequence_diagram_real/elk/sketch.exp.svg | 6 +- .../dagre/board.exp.json | 21 ++- .../dagre/sketch.exp.svg | 4 + .../elk/board.exp.json | 21 ++- .../elk/sketch.exp.svg | 4 + .../dagre/board.exp.json | 15 +- .../dagre/sketch.exp.svg | 4 + .../elk/board.exp.json | 15 +- .../elk/sketch.exp.svg | 4 + .../dagre/board.exp.json | 51 +++-- .../dagre/sketch.exp.svg | 4 + .../sequence_diagram_span/elk/board.exp.json | 51 +++-- .../sequence_diagram_span/elk/sketch.exp.svg | 4 + .../sequence_diagrams/dagre/board.exp.json | 178 ++++++++++++------ .../sequence_diagrams/dagre/sketch.exp.svg | 4 + .../sequence_diagrams/elk/board.exp.json | 178 ++++++++++++------ .../sequence_diagrams/elk/sketch.exp.svg | 4 + .../stable/sql_tables/dagre/board.exp.json | 4 + .../stable/sql_tables/dagre/sketch.exp.svg | 4 + .../stable/sql_tables/elk/board.exp.json | 4 + .../stable/sql_tables/elk/sketch.exp.svg | 4 + .../stable/square_3d/dagre/board.exp.json | 2 + .../stable/square_3d/dagre/sketch.exp.svg | 4 + .../stable/square_3d/elk/board.exp.json | 2 + .../stable/square_3d/elk/sketch.exp.svg | 4 + .../dagre/board.exp.json | 25 +++ .../dagre/sketch.exp.svg | 4 + .../elk/board.exp.json | 25 +++ .../elk/sketch.exp.svg | 4 + .../stable/stylish/dagre/board.exp.json | 2 + .../stable/stylish/dagre/sketch.exp.svg | 4 + .../stable/stylish/elk/board.exp.json | 2 + .../stable/stylish/elk/sketch.exp.svg | 4 + .../transparent_3d/dagre/board.exp.json | 1 + .../transparent_3d/dagre/sketch.exp.svg | 4 + .../stable/transparent_3d/elk/board.exp.json | 1 + .../stable/transparent_3d/elk/sketch.exp.svg | 4 + .../stable/us_map/dagre/board.exp.json | 50 +++++ .../stable/us_map/dagre/sketch.exp.svg | 4 + .../testdata/stable/us_map/elk/board.exp.json | 50 +++++ .../testdata/stable/us_map/elk/sketch.exp.svg | 4 + .../container_child_edge/dagre/board.exp.json | 3 + .../container_child_edge/dagre/sketch.exp.svg | 4 + .../container_child_edge/elk/board.exp.json | 3 + .../container_child_edge/elk/sketch.exp.svg | 4 + .../dagre/board.exp.json | 5 + .../dagre/sketch.exp.svg | 4 + .../elk/board.exp.json | 5 + .../elk/sketch.exp.svg | 4 + .../font_sizes_large/dagre/board.exp.json | 5 + .../font_sizes_large/dagre/sketch.exp.svg | 4 + .../todo/font_sizes_large/elk/board.exp.json | 5 + .../todo/font_sizes_large/elk/sketch.exp.svg | 4 + .../todo/tall_edge_label/dagre/board.exp.json | 2 + .../todo/tall_edge_label/dagre/sketch.exp.svg | 4 + .../todo/tall_edge_label/elk/board.exp.json | 2 + .../todo/tall_edge_label/elk/sketch.exp.svg | 4 + 283 files changed, 2203 insertions(+), 324 deletions(-) diff --git a/d2exporter/export.go b/d2exporter/export.go index 2f8e5ec40..526304649 100644 --- a/d2exporter/export.go +++ b/d2exporter/export.go @@ -99,6 +99,10 @@ func toShape(obj *d2graph.Object, theme *d2themes.Theme) d2target.Shape { shape.Italic = text.IsItalic shape.FontSize = text.FontSize + if obj.IsSequenceDiagramGroup() { + shape.Blend = true + } + applyStyles(shape, obj) applyTheme(shape, obj, theme) shape.Color = text.GetColor(theme, shape.Italic) diff --git a/d2layouts/d2sequence/constants.go b/d2layouts/d2sequence/constants.go index 78ff0ce16..a29578d5a 100644 --- a/d2layouts/d2sequence/constants.go +++ b/d2layouts/d2sequence/constants.go @@ -36,9 +36,9 @@ const LIFELINE_STROKE_DASH int = 6 const LIFELINE_LABEL_PAD = 5. const ( - GROUP_Z_INDEX = 1 - LIFELINE_Z_INDEX = 2 - SPAN_Z_INDEX = 3 + LIFELINE_Z_INDEX = 1 + SPAN_Z_INDEX = 2 + GROUP_Z_INDEX = 3 MESSAGE_Z_INDEX = 4 NOTE_Z_INDEX = 5 ) diff --git a/d2renderers/d2svg/d2svg.go b/d2renderers/d2svg/d2svg.go index e46a0fb79..6bf9135a9 100644 --- a/d2renderers/d2svg/d2svg.go +++ b/d2renderers/d2svg/d2svg.go @@ -604,7 +604,12 @@ func drawShape(writer io.Writer, targetShape d2target.Shape) error { } } - fmt.Fprintf(writer, ``, shadowAttr) + var blendModeClass string + if targetShape.Blend { + blendModeClass = " blend" + } + + fmt.Fprintf(writer, ``, blendModeClass, shadowAttr) var multipleTL *geo.Point if targetShape.Multiple { diff --git a/d2renderers/d2svg/style.css b/d2renderers/d2svg/style.css index f5cffa9cc..0068533c5 100644 --- a/d2renderers/d2svg/style.css +++ b/d2renderers/d2svg/style.css @@ -6,3 +6,7 @@ stroke-linecap: round; stroke-linejoin: round; } + +.blend { + mix-blend-mode: multiply; +} diff --git a/d2target/d2target.go b/d2target/d2target.go index 9c2dd2c9b..f8c0ff0cc 100644 --- a/d2target/d2target.go +++ b/d2target/d2target.go @@ -111,6 +111,10 @@ type Shape struct { Icon *url.URL `json:"icon"` IconPosition string `json:"iconPosition"` + // Whether the shape should allow shapes behind it to bleed through + // Currently just used for sequence diagram groups + Blend bool `json:"blend"` + Class SQLTable diff --git a/e2etests/testdata/sanity/1_to_2/dagre/board.exp.json b/e2etests/testdata/sanity/1_to_2/dagre/board.exp.json index 7649f1aa0..53c443478 100644 --- a/e2etests/testdata/sanity/1_to_2/dagre/board.exp.json +++ b/e2etests/testdata/sanity/1_to_2/dagre/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -62,6 +63,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -101,6 +103,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, diff --git a/e2etests/testdata/sanity/1_to_2/dagre/sketch.exp.svg b/e2etests/testdata/sanity/1_to_2/dagre/sketch.exp.svg index 8e0b6bde3..1ff7bb178 100644 --- a/e2etests/testdata/sanity/1_to_2/dagre/sketch.exp.svg +++ b/e2etests/testdata/sanity/1_to_2/dagre/sketch.exp.svg @@ -13,6 +13,10 @@ width="486" height="552" viewBox="-100 -100 486 552">abc abc ab ab acbd acbd ab hello diff --git a/e2etests/testdata/sanity/connection_label/elk/board.exp.json b/e2etests/testdata/sanity/connection_label/elk/board.exp.json index 2680db2b1..be654cbef 100644 --- a/e2etests/testdata/sanity/connection_label/elk/board.exp.json +++ b/e2etests/testdata/sanity/connection_label/elk/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -62,6 +63,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, diff --git a/e2etests/testdata/sanity/connection_label/elk/sketch.exp.svg b/e2etests/testdata/sanity/connection_label/elk/sketch.exp.svg index 72194bada..e4bf0727d 100644 --- a/e2etests/testdata/sanity/connection_label/elk/sketch.exp.svg +++ b/e2etests/testdata/sanity/connection_label/elk/sketch.exp.svg @@ -13,6 +13,10 @@ width="313" height="673" viewBox="-88 -88 313 673">ab hello diff --git a/e2etests/testdata/sanity/empty/dagre/sketch.exp.svg b/e2etests/testdata/sanity/empty/dagre/sketch.exp.svg index 5c521366b..f0384e16b 100644 --- a/e2etests/testdata/sanity/empty/dagre/sketch.exp.svg +++ b/e2etests/testdata/sanity/empty/dagre/sketch.exp.svg @@ -13,5 +13,9 @@ width="202" height="202" viewBox="9223372036854775707 9223372036854775707 202 20 stroke-linejoin: round; } +.blend { + mix-blend-mode: multiply; +} + ]]> \ No newline at end of file diff --git a/e2etests/testdata/sanity/empty/elk/sketch.exp.svg b/e2etests/testdata/sanity/empty/elk/sketch.exp.svg index 5c521366b..f0384e16b 100644 --- a/e2etests/testdata/sanity/empty/elk/sketch.exp.svg +++ b/e2etests/testdata/sanity/empty/elk/sketch.exp.svg @@ -13,5 +13,9 @@ width="202" height="202" viewBox="9223372036854775707 9223372036854775707 202 20 stroke-linejoin: round; } +.blend { + mix-blend-mode: multiply; +} + ]]> \ No newline at end of file diff --git a/e2etests/testdata/stable/all_shapes/dagre/board.exp.json b/e2etests/testdata/stable/all_shapes/dagre/board.exp.json index a86e092db..edc6e7bca 100644 --- a/e2etests/testdata/stable/all_shapes/dagre/board.exp.json +++ b/e2etests/testdata/stable/all_shapes/dagre/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -62,6 +63,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -101,6 +103,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -140,6 +143,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -179,6 +183,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -218,6 +223,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -257,6 +263,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -296,6 +303,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -335,6 +343,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -374,6 +383,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -413,6 +423,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -452,6 +463,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -491,6 +503,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -530,6 +543,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -569,6 +583,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -608,6 +623,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -647,6 +663,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, diff --git a/e2etests/testdata/stable/all_shapes/dagre/sketch.exp.svg b/e2etests/testdata/stable/all_shapes/dagre/sketch.exp.svg index 43a253d77..a11c9919a 100644 --- a/e2etests/testdata/stable/all_shapes/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes/dagre/sketch.exp.svg @@ -13,6 +13,10 @@ width="1539" height="824" viewBox="-100 -100 1539 824">rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud diff --git a/e2etests/testdata/stable/all_shapes_shadow/elk/board.exp.json b/e2etests/testdata/stable/all_shapes_shadow/elk/board.exp.json index 4ed2ccd1d..03c629d51 100644 --- a/e2etests/testdata/stable/all_shapes_shadow/elk/board.exp.json +++ b/e2etests/testdata/stable/all_shapes_shadow/elk/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -62,6 +63,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -101,6 +103,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -140,6 +143,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -179,6 +183,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -218,6 +223,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -257,6 +263,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -296,6 +303,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -335,6 +343,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -374,6 +383,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -413,6 +423,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -452,6 +463,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -491,6 +503,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -530,6 +543,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -569,6 +583,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -608,6 +623,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -647,6 +663,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, diff --git a/e2etests/testdata/stable/all_shapes_shadow/elk/sketch.exp.svg b/e2etests/testdata/stable/all_shapes_shadow/elk/sketch.exp.svg index c8f03debb..6ad485443 100644 --- a/e2etests/testdata/stable/all_shapes_shadow/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes_shadow/elk/sketch.exp.svg @@ -13,6 +13,10 @@ width="1352" height="824" viewBox="-88 -88 1352 824"> diff --git a/e2etests/testdata/stable/arrowhead_adjustment/dagre/board.exp.json b/e2etests/testdata/stable/arrowhead_adjustment/dagre/board.exp.json index 53e292e5b..382538056 100644 --- a/e2etests/testdata/stable/arrowhead_adjustment/dagre/board.exp.json +++ b/e2etests/testdata/stable/arrowhead_adjustment/dagre/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -62,6 +63,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -101,6 +103,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -140,6 +143,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, diff --git a/e2etests/testdata/stable/arrowhead_adjustment/dagre/sketch.exp.svg b/e2etests/testdata/stable/arrowhead_adjustment/dagre/sketch.exp.svg index 21eddaa17..2ec107a86 100644 --- a/e2etests/testdata/stable/arrowhead_adjustment/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/arrowhead_adjustment/dagre/sketch.exp.svg @@ -13,6 +13,10 @@ width="480" height="778" viewBox="-100 -100 480 778">cba * cba * ab To err is human, to moo bovine1* diff --git a/e2etests/testdata/stable/arrowhead_labels/elk/board.exp.json b/e2etests/testdata/stable/arrowhead_labels/elk/board.exp.json index 648d83fc8..97667ccc4 100644 --- a/e2etests/testdata/stable/arrowhead_labels/elk/board.exp.json +++ b/e2etests/testdata/stable/arrowhead_labels/elk/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -62,6 +63,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, diff --git a/e2etests/testdata/stable/arrowhead_labels/elk/sketch.exp.svg b/e2etests/testdata/stable/arrowhead_labels/elk/sketch.exp.svg index b2cd02bfb..fd34c4bad 100644 --- a/e2etests/testdata/stable/arrowhead_labels/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/arrowhead_labels/elk/sketch.exp.svg @@ -13,6 +13,10 @@ width="401" height="673" viewBox="14 -88 401 673">ab To err is human, to moo bovine1* diff --git a/e2etests/testdata/stable/binary_tree/dagre/board.exp.json b/e2etests/testdata/stable/binary_tree/dagre/board.exp.json index 92781dc2d..a8a2e2377 100644 --- a/e2etests/testdata/stable/binary_tree/dagre/board.exp.json +++ b/e2etests/testdata/stable/binary_tree/dagre/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -62,6 +63,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -101,6 +103,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -140,6 +143,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -179,6 +183,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -218,6 +223,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -257,6 +263,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -296,6 +303,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -335,6 +343,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -374,6 +383,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -413,6 +423,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -452,6 +463,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -491,6 +503,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -530,6 +543,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -569,6 +583,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, diff --git a/e2etests/testdata/stable/binary_tree/dagre/sketch.exp.svg b/e2etests/testdata/stable/binary_tree/dagre/sketch.exp.svg index 4dc067779..0d18868a4 100644 --- a/e2etests/testdata/stable/binary_tree/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/binary_tree/dagre/sketch.exp.svg @@ -13,6 +13,10 @@ width="1518" height="1004" viewBox="-100 -100 1518 1004">abcdefghijklmno abcdefghijklmno aaadddeeebbbccc111 222 diff --git a/e2etests/testdata/stable/chaos1/elk/board.exp.json b/e2etests/testdata/stable/chaos1/elk/board.exp.json index a8b4d6e22..d7fcac07d 100644 --- a/e2etests/testdata/stable/chaos1/elk/board.exp.json +++ b/e2etests/testdata/stable/chaos1/elk/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -62,6 +63,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -101,6 +103,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -140,6 +143,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -179,6 +183,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, diff --git a/e2etests/testdata/stable/chaos1/elk/sketch.exp.svg b/e2etests/testdata/stable/chaos1/elk/sketch.exp.svg index d1d227fe1..41904b6b7 100644 --- a/e2etests/testdata/stable/chaos1/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/chaos1/elk/sketch.exp.svg @@ -13,6 +13,10 @@ width="630" height="869" viewBox="-88 -88 630 869">aaadddeeebbbccc111 222 diff --git a/e2etests/testdata/stable/chaos2/dagre/board.exp.json b/e2etests/testdata/stable/chaos2/dagre/board.exp.json index 04707eae5..c928b6a24 100644 --- a/e2etests/testdata/stable/chaos2/dagre/board.exp.json +++ b/e2etests/testdata/stable/chaos2/dagre/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -62,6 +63,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -101,6 +103,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -140,6 +143,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -179,6 +183,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -217,6 +222,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -256,6 +262,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -294,6 +301,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -333,6 +341,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -372,6 +381,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -411,6 +421,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -450,6 +461,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -489,6 +501,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -528,6 +541,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -566,6 +580,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, diff --git a/e2etests/testdata/stable/chaos2/dagre/sketch.exp.svg b/e2etests/testdata/stable/chaos2/dagre/sketch.exp.svg index 1e18f39e6..9459e4d9b 100644 --- a/e2etests/testdata/stable/chaos2/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/chaos2/dagre/sketch.exp.svg @@ -13,6 +13,10 @@ width="1317" height="1854" viewBox="-100 -100 1317 1854">abcd abcd abc abc BatchManager- num diff --git a/e2etests/testdata/stable/class/elk/board.exp.json b/e2etests/testdata/stable/class/elk/board.exp.json index 67427ed80..85549a957 100644 --- a/e2etests/testdata/stable/class/elk/board.exp.json +++ b/e2etests/testdata/stable/class/elk/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": [ { "name": "num", diff --git a/e2etests/testdata/stable/class/elk/sketch.exp.svg b/e2etests/testdata/stable/class/elk/sketch.exp.svg index d8ed26ffe..4ab440c33 100644 --- a/e2etests/testdata/stable/class/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/class/elk/sketch.exp.svg @@ -13,6 +13,10 @@ width="539" height="568" viewBox="-88 -88 539 568">BatchManager- num diff --git a/e2etests/testdata/stable/code_snippet/dagre/board.exp.json b/e2etests/testdata/stable/code_snippet/dagre/board.exp.json index 6cd1e4202..c058364e1 100644 --- a/e2etests/testdata/stable/code_snippet/dagre/board.exp.json +++ b/e2etests/testdata/stable/code_snippet/dagre/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -61,6 +62,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -100,6 +102,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, diff --git a/e2etests/testdata/stable/code_snippet/dagre/sketch.exp.svg b/e2etests/testdata/stable/code_snippet/dagre/sketch.exp.svg index 5594e9403..fc08ed11c 100644 --- a/e2etests/testdata/stable/code_snippet/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/code_snippet/dagre/sketch.exp.svg @@ -13,6 +13,10 @@ width="955" height="818" viewBox="-100 -100 955 818">// RegisterHash registers a function that returns a new instance of the given // hash function. This is intended to be called from the init function in diff --git a/e2etests/testdata/stable/code_snippet/elk/board.exp.json b/e2etests/testdata/stable/code_snippet/elk/board.exp.json index b8f8d107a..0004dd714 100644 --- a/e2etests/testdata/stable/code_snippet/elk/board.exp.json +++ b/e2etests/testdata/stable/code_snippet/elk/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -61,6 +62,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -100,6 +102,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, diff --git a/e2etests/testdata/stable/code_snippet/elk/sketch.exp.svg b/e2etests/testdata/stable/code_snippet/elk/sketch.exp.svg index 9656a4a1d..c8c6982f2 100644 --- a/e2etests/testdata/stable/code_snippet/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/code_snippet/elk/sketch.exp.svg @@ -13,6 +13,10 @@ width="955" height="818" viewBox="-88 -88 955 818">// RegisterHash registers a function that returns a new instance of the given // hash function. This is intended to be called from the init function in diff --git a/e2etests/testdata/stable/connected_container/dagre/board.exp.json b/e2etests/testdata/stable/connected_container/dagre/board.exp.json index a3f8f7a7d..f16c21da4 100644 --- a/e2etests/testdata/stable/connected_container/dagre/board.exp.json +++ b/e2etests/testdata/stable/connected_container/dagre/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -62,6 +63,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -101,6 +103,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -140,6 +143,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -179,6 +183,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -218,6 +223,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -257,6 +263,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, diff --git a/e2etests/testdata/stable/connected_container/dagre/sketch.exp.svg b/e2etests/testdata/stable/connected_container/dagre/sketch.exp.svg index 7e3ba639a..ef178c1b5 100644 --- a/e2etests/testdata/stable/connected_container/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/connected_container/dagre/sketch.exp.svg @@ -13,6 +13,10 @@ width="494" height="1178" viewBox="-100 -100 494 1178">acfbdhg acfbdhg agdfbhec agdfbhec abcdefghijklmnopq abcdefghijklmnopq finallyatreeandnodessomemoremanythenhereyouhavehierarchyanotherofnestingtreesatreeinsidehierarchyroot finallyatreeandnodessomemoremanythenhereyouhavehierarchyanotherofnestingtreesatreeinsidehierarchyroot bacde21345abcde bacde21345abcde alphabeta gamma diff --git a/e2etests/testdata/stable/font_colors/elk/board.exp.json b/e2etests/testdata/stable/font_colors/elk/board.exp.json index 2766ed834..c7cbbba18 100644 --- a/e2etests/testdata/stable/font_colors/elk/board.exp.json +++ b/e2etests/testdata/stable/font_colors/elk/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -62,6 +63,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, diff --git a/e2etests/testdata/stable/font_colors/elk/sketch.exp.svg b/e2etests/testdata/stable/font_colors/elk/sketch.exp.svg index bdda7137b..d39ec3ce2 100644 --- a/e2etests/testdata/stable/font_colors/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/font_colors/elk/sketch.exp.svg @@ -13,6 +13,10 @@ width="345" height="673" viewBox="-88 -88 345 673">alphabeta gamma diff --git a/e2etests/testdata/stable/font_sizes/dagre/board.exp.json b/e2etests/testdata/stable/font_sizes/dagre/board.exp.json index 8550c2c31..3a91ea14e 100644 --- a/e2etests/testdata/stable/font_sizes/dagre/board.exp.json +++ b/e2etests/testdata/stable/font_sizes/dagre/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -62,6 +63,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -101,6 +103,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -140,6 +143,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -179,6 +183,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -218,6 +223,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -257,6 +263,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -296,6 +303,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -335,6 +343,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -374,6 +383,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -413,6 +423,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -452,6 +463,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, diff --git a/e2etests/testdata/stable/font_sizes/dagre/sketch.exp.svg b/e2etests/testdata/stable/font_sizes/dagre/sketch.exp.svg index b3a5e27e9..98907b633 100644 --- a/e2etests/testdata/stable/font_sizes/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/font_sizes/dagre/sketch.exp.svg @@ -13,6 +13,10 @@ width="2360" height="632" viewBox="-100 -100 2360 632">size XSsize Ssize Msize Lsize XLsize XXLsize XXXLcustom 8custom 12custom 18custom 21custom 64 custom 10custom 15custom 48 diff --git a/e2etests/testdata/stable/font_sizes/elk/board.exp.json b/e2etests/testdata/stable/font_sizes/elk/board.exp.json index 2fcb8f721..2d5446e61 100644 --- a/e2etests/testdata/stable/font_sizes/elk/board.exp.json +++ b/e2etests/testdata/stable/font_sizes/elk/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -62,6 +63,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -101,6 +103,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -140,6 +143,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -179,6 +183,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -218,6 +223,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -257,6 +263,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -296,6 +303,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -335,6 +343,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -374,6 +383,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -413,6 +423,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -452,6 +463,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, diff --git a/e2etests/testdata/stable/font_sizes/elk/sketch.exp.svg b/e2etests/testdata/stable/font_sizes/elk/sketch.exp.svg index c69206fcb..3cddd5e5c 100644 --- a/e2etests/testdata/stable/font_sizes/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/font_sizes/elk/sketch.exp.svg @@ -13,6 +13,10 @@ width="1965" height="793" viewBox="-88 -88 1965 793">size XSsize Ssize Msize Lsize XLsize XXLsize XXXLcustom 8custom 12custom 18custom 21custom 64 custom 10custom 15custom 48 diff --git a/e2etests/testdata/stable/giant_markdown_test/dagre/board.exp.json b/e2etests/testdata/stable/giant_markdown_test/dagre/board.exp.json index 4d1de50b6..62256201b 100644 --- a/e2etests/testdata/stable/giant_markdown_test/dagre/board.exp.json +++ b/e2etests/testdata/stable/giant_markdown_test/dagre/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -61,6 +62,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -100,6 +102,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, diff --git a/e2etests/testdata/stable/giant_markdown_test/dagre/sketch.exp.svg b/e2etests/testdata/stable/giant_markdown_test/dagre/sketch.exp.svg index aa40b0cde..d5aa9cf56 100644 --- a/e2etests/testdata/stable/giant_markdown_test/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/giant_markdown_test/dagre/sketch.exp.svg @@ -13,6 +13,10 @@ width="3251" height="5500" viewBox="-100 -100 3251 5500">hellohelloab ab aabbccddllffwwyynniijjkkssuurmeemmmmgghhzzooppqqrrttvvxxabac 123456 diff --git a/e2etests/testdata/stable/investigate/elk/board.exp.json b/e2etests/testdata/stable/investigate/elk/board.exp.json index 8f9f4f4bf..19c07f20c 100644 --- a/e2etests/testdata/stable/investigate/elk/board.exp.json +++ b/e2etests/testdata/stable/investigate/elk/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -62,6 +63,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -101,6 +103,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -140,6 +143,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -179,6 +183,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -218,6 +223,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -257,6 +263,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -296,6 +303,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -335,6 +343,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -374,6 +383,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -413,6 +423,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -463,6 +474,7 @@ "RawFragment": "" }, "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -502,6 +514,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -552,6 +565,7 @@ "RawFragment": "" }, "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -591,6 +605,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -630,6 +645,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -669,6 +685,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -708,6 +725,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -747,6 +765,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -786,6 +805,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -825,6 +845,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -864,6 +885,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -903,6 +925,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -942,6 +965,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -981,6 +1005,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1020,6 +1045,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1059,6 +1085,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1098,6 +1125,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1137,6 +1165,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1176,6 +1205,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1215,6 +1245,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, diff --git a/e2etests/testdata/stable/investigate/elk/sketch.exp.svg b/e2etests/testdata/stable/investigate/elk/sketch.exp.svg index cd4553a99..a9f7ef86d 100644 --- a/e2etests/testdata/stable/investigate/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/investigate/elk/sketch.exp.svg @@ -13,6 +13,10 @@ width="860" height="4868" viewBox="-82 -88 860 4868">aabbccddllffwwyynniijjkkssuurmeemmmmgghhzzooppqqrrttvvxxabac 123456 diff --git a/e2etests/testdata/stable/large_arch/dagre/board.exp.json b/e2etests/testdata/stable/large_arch/dagre/board.exp.json index 9d3b17eff..f62e8f5a5 100644 --- a/e2etests/testdata/stable/large_arch/dagre/board.exp.json +++ b/e2etests/testdata/stable/large_arch/dagre/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -62,6 +63,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -101,6 +103,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -140,6 +143,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -179,6 +183,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -218,6 +223,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -257,6 +263,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -296,6 +303,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -335,6 +343,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -374,6 +383,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -413,6 +423,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -452,6 +463,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -491,6 +503,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -530,6 +543,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -569,6 +583,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -608,6 +623,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -647,6 +663,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -686,6 +703,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -725,6 +743,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -764,6 +783,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -803,6 +823,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -842,6 +863,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -881,6 +903,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -920,6 +943,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -959,6 +983,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -998,6 +1023,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1037,6 +1063,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1076,6 +1103,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1115,6 +1143,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1154,6 +1183,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1193,6 +1223,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1232,6 +1263,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1271,6 +1303,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, diff --git a/e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg b/e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg index ee5c062cc..ad186e9a7 100644 --- a/e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg @@ -13,6 +13,10 @@ width="3244" height="1780" viewBox="-100 -100 3244 1780">abcdefghiqrjmnoszaabbeeffggklptuwxyccddv abcdefghiqrjmnoszaabbeeffggklptuwxyccddv thisgoesmultiple linesthisgoesmultiple linesabcdefghijklmnopqrstuvw abcdefghijklmnopqrstuvw abcdefghijklmnopqrstu abcdefghijklmnopqrstu Foo Baz12hello Foo Baz12hello acdefgbh acdefgbh topabcbottomstartend topabcbottomstartend xyz hello diff --git a/e2etests/testdata/stable/self-referencing/elk/board.exp.json b/e2etests/testdata/stable/self-referencing/elk/board.exp.json index 8ea3dd21a..36e35e83d 100644 --- a/e2etests/testdata/stable/self-referencing/elk/board.exp.json +++ b/e2etests/testdata/stable/self-referencing/elk/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -62,6 +63,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -101,6 +103,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, diff --git a/e2etests/testdata/stable/self-referencing/elk/sketch.exp.svg b/e2etests/testdata/stable/self-referencing/elk/sketch.exp.svg index 058ea980c..6ac4cb479 100644 --- a/e2etests/testdata/stable/self-referencing/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/self-referencing/elk/sketch.exp.svg @@ -13,6 +13,10 @@ width="572" height="552" viewBox="-70 -88 572 552">xyz hello diff --git a/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/board.exp.json index 56c919de8..590f243d9 100644 --- a/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -62,6 +63,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -101,6 +103,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": [ { @@ -151,6 +154,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -190,6 +194,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -229,6 +234,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -268,6 +274,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -307,6 +314,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -346,6 +354,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -396,6 +405,7 @@ "RawFragment": "" }, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -435,6 +445,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -474,6 +485,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -513,6 +525,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -552,6 +565,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -591,6 +605,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -630,6 +645,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -669,6 +685,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -708,6 +725,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -747,6 +765,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -786,6 +805,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": [ @@ -1596,7 +1616,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(b -- )[0]", @@ -1635,7 +1655,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(c -- )[0]", @@ -1674,7 +1694,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(d -- )[0]", @@ -1713,7 +1733,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(e -- )[0]", @@ -1752,7 +1772,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(f -- )[0]", @@ -1791,7 +1811,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(g -- )[0]", @@ -1830,7 +1850,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(h -- )[0]", @@ -1869,7 +1889,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(i -- )[0]", @@ -1908,7 +1928,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(j -- )[0]", @@ -1947,7 +1967,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(k -- )[0]", @@ -1986,7 +2006,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(l -- )[0]", @@ -2025,7 +2045,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(m -- )[0]", @@ -2064,7 +2084,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(n -- )[0]", @@ -2103,7 +2123,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(o -- )[0]", @@ -2142,7 +2162,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(p -- )[0]", @@ -2181,7 +2201,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(q -- )[0]", @@ -2220,7 +2240,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(r -- )[0]", @@ -2259,7 +2279,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(s -- )[0]", @@ -2298,7 +2318,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(t -- )[0]", @@ -2337,7 +2357,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 } ] } diff --git a/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg index 03afbe816..23483b172 100644 --- a/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg @@ -13,6 +13,10 @@ width="4908" height="2984" viewBox="-100 -50 4908 2984">a labelblabelsa class+ public() bool diff --git a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/board.exp.json index 56c919de8..590f243d9 100644 --- a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -62,6 +63,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -101,6 +103,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": [ { @@ -151,6 +154,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -190,6 +194,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -229,6 +234,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -268,6 +274,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -307,6 +314,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -346,6 +354,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -396,6 +405,7 @@ "RawFragment": "" }, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -435,6 +445,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -474,6 +485,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -513,6 +525,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -552,6 +565,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -591,6 +605,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -630,6 +645,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -669,6 +685,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -708,6 +725,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -747,6 +765,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -786,6 +805,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": [ @@ -1596,7 +1616,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(b -- )[0]", @@ -1635,7 +1655,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(c -- )[0]", @@ -1674,7 +1694,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(d -- )[0]", @@ -1713,7 +1733,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(e -- )[0]", @@ -1752,7 +1772,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(f -- )[0]", @@ -1791,7 +1811,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(g -- )[0]", @@ -1830,7 +1850,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(h -- )[0]", @@ -1869,7 +1889,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(i -- )[0]", @@ -1908,7 +1928,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(j -- )[0]", @@ -1947,7 +1967,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(k -- )[0]", @@ -1986,7 +2006,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(l -- )[0]", @@ -2025,7 +2045,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(m -- )[0]", @@ -2064,7 +2084,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(n -- )[0]", @@ -2103,7 +2123,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(o -- )[0]", @@ -2142,7 +2162,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(p -- )[0]", @@ -2181,7 +2201,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(q -- )[0]", @@ -2220,7 +2240,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(r -- )[0]", @@ -2259,7 +2279,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(s -- )[0]", @@ -2298,7 +2318,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(t -- )[0]", @@ -2337,7 +2357,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 } ] } diff --git a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg index 03afbe816..23483b172 100644 --- a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg @@ -13,6 +13,10 @@ width="4908" height="2984" viewBox="-100 -50 4908 2984">a labelblabelsa class+ public() bool diff --git a/e2etests/testdata/stable/sequence_diagram_groups/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_groups/dagre/board.exp.json index d3b8d9c6a..49d702816 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_groups/dagre/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -62,6 +63,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -101,6 +103,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -140,6 +143,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -179,6 +183,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": true, "fields": null, "methods": null, "columns": null, @@ -192,7 +197,7 @@ "underline": false, "labelWidth": 30, "labelHeight": 26, - "zIndex": 1, + "zIndex": 3, "level": 1 }, { @@ -217,6 +222,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": true, "fields": null, "methods": null, "columns": null, @@ -230,7 +236,7 @@ "underline": false, "labelWidth": 57, "labelHeight": 26, - "zIndex": 1, + "zIndex": 3, "level": 1 }, { @@ -255,6 +261,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": true, "fields": null, "methods": null, "columns": null, @@ -268,7 +275,7 @@ "underline": false, "labelWidth": 78, "labelHeight": 26, - "zIndex": 1, + "zIndex": 3, "level": 2 }, { @@ -293,6 +300,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": true, "fields": null, "methods": null, "columns": null, @@ -306,7 +314,7 @@ "underline": false, "labelWidth": 58, "labelHeight": 26, - "zIndex": 1, + "zIndex": 3, "level": 1 }, { @@ -331,6 +339,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": true, "fields": null, "methods": null, "columns": null, @@ -370,6 +379,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": true, "fields": null, "methods": null, "columns": null, @@ -383,7 +393,7 @@ "underline": false, "labelWidth": 38, "labelHeight": 26, - "zIndex": 1, + "zIndex": 3, "level": 1 }, { @@ -408,6 +418,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": true, "fields": null, "methods": null, "columns": null, @@ -447,6 +458,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -460,7 +472,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 2 }, { @@ -485,6 +497,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -498,7 +511,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 2 }, { @@ -523,6 +536,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -536,7 +550,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 3 } ], @@ -968,7 +982,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(b -- )[0]", @@ -1007,7 +1021,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(c -- )[0]", @@ -1046,7 +1060,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(d -- )[0]", @@ -1085,7 +1099,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 } ] } diff --git a/e2etests/testdata/stable/sequence_diagram_groups/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_groups/dagre/sketch.exp.svg index 2998278f8..42148947f 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_groups/dagre/sketch.exp.svg @@ -13,8 +13,12 @@ width="1057" height="2268" viewBox="-100 -50 1057 2268">abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note +abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note diff --git a/e2etests/testdata/stable/sequence_diagram_groups/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_groups/elk/board.exp.json index d3b8d9c6a..49d702816 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_groups/elk/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -62,6 +63,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -101,6 +103,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -140,6 +143,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -179,6 +183,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": true, "fields": null, "methods": null, "columns": null, @@ -192,7 +197,7 @@ "underline": false, "labelWidth": 30, "labelHeight": 26, - "zIndex": 1, + "zIndex": 3, "level": 1 }, { @@ -217,6 +222,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": true, "fields": null, "methods": null, "columns": null, @@ -230,7 +236,7 @@ "underline": false, "labelWidth": 57, "labelHeight": 26, - "zIndex": 1, + "zIndex": 3, "level": 1 }, { @@ -255,6 +261,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": true, "fields": null, "methods": null, "columns": null, @@ -268,7 +275,7 @@ "underline": false, "labelWidth": 78, "labelHeight": 26, - "zIndex": 1, + "zIndex": 3, "level": 2 }, { @@ -293,6 +300,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": true, "fields": null, "methods": null, "columns": null, @@ -306,7 +314,7 @@ "underline": false, "labelWidth": 58, "labelHeight": 26, - "zIndex": 1, + "zIndex": 3, "level": 1 }, { @@ -331,6 +339,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": true, "fields": null, "methods": null, "columns": null, @@ -370,6 +379,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": true, "fields": null, "methods": null, "columns": null, @@ -383,7 +393,7 @@ "underline": false, "labelWidth": 38, "labelHeight": 26, - "zIndex": 1, + "zIndex": 3, "level": 1 }, { @@ -408,6 +418,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": true, "fields": null, "methods": null, "columns": null, @@ -447,6 +458,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -460,7 +472,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 2 }, { @@ -485,6 +497,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -498,7 +511,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 2 }, { @@ -523,6 +536,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -536,7 +550,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 3 } ], @@ -968,7 +982,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(b -- )[0]", @@ -1007,7 +1021,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(c -- )[0]", @@ -1046,7 +1060,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(d -- )[0]", @@ -1085,7 +1099,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 } ] } diff --git a/e2etests/testdata/stable/sequence_diagram_groups/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_groups/elk/sketch.exp.svg index 2998278f8..42148947f 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_groups/elk/sketch.exp.svg @@ -13,8 +13,12 @@ width="1057" height="2268" viewBox="-100 -50 1057 2268">abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note +abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note diff --git a/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/board.exp.json index 5b1b197f4..705a340e1 100644 --- a/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -62,6 +63,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -75,7 +77,7 @@ "underline": false, "labelWidth": 29, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 2 }, { @@ -100,6 +102,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -139,6 +142,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -152,7 +156,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 2 }, { @@ -177,6 +181,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -216,6 +221,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -229,7 +235,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 2 }, { @@ -254,6 +260,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -267,7 +274,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 3 }, { @@ -292,6 +299,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -331,6 +339,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -344,7 +353,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 2 }, { @@ -369,6 +378,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -382,7 +392,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 3 }, { @@ -407,6 +417,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -420,7 +431,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 4 }, { @@ -445,6 +456,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -484,6 +496,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -497,7 +510,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 2 }, { @@ -522,6 +535,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -535,7 +549,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 3 }, { @@ -560,6 +574,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -573,7 +588,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 4 }, { @@ -598,6 +613,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -611,7 +627,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 5 }, { @@ -636,6 +652,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -675,6 +692,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -688,7 +706,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 2 }, { @@ -713,6 +731,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -726,7 +745,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 3 }, { @@ -751,6 +770,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -764,7 +784,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 4 }, { @@ -789,6 +809,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -802,7 +823,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 5 }, { @@ -827,6 +848,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -840,7 +862,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 6 }, { @@ -865,6 +887,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -878,7 +901,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 2 } ], @@ -1271,7 +1294,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(itemResponse -- )[0]", @@ -1310,7 +1333,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(item -- )[0]", @@ -1349,7 +1372,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(essayRubric -- )[0]", @@ -1388,7 +1411,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(concept -- )[0]", @@ -1427,7 +1450,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(itemOutcome -- )[0]", @@ -1466,7 +1489,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 } ] } diff --git a/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/sketch.exp.svg index f2bb4e085..4d41134f1 100644 --- a/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/sketch.exp.svg @@ -13,6 +13,10 @@ width="1593" height="1626" viewBox="-100 -50 1593 1626">scoreritemResponseitemessayRubricconceptitemOutcome scoreritemResponseitemessayRubricconceptitemOutcome abcd okayexplanationanother explanationSome one who believes imaginary things appear right before your i's.The earth is like a tiny grain of sand, only much, much heavier +abcd okayexplanationanother explanationSome one who believes imaginary things appear right before your i's.The earth is like a tiny grain of sand, only much, much heavier abcd okayexplanationanother explanationSome one who believes imaginary things appear right before your i's.The earth is like a tiny grain of sand, only much, much heavier +abcd okayexplanationanother explanationSome one who believes imaginary things appear right before your i's.The earth is like a tiny grain of sand, only much, much heavier How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutonly if root is not sequence 'How this is rendered: {...}'tokenized ASTcompile ASTobjects and edgesrun layout enginesrun engine on shape: sequence_diagram, temporarily removerun core engine on rest add back in sequence diagramsdiagram with correct positions and dimensionsexport diagram with chosen theme and rendererget theme stylesrender to SVGresulting SVGmeasurements also take place +How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutonly if root is not sequence 'How this is rendered: {...}'tokenized ASTcompile ASTobjects and edgesrun layout enginesrun engine on shape: sequence_diagram, temporarily removerun core engine on rest add back in sequence diagramsdiagram with correct positions and dimensionsexport diagram with chosen theme and rendererget theme stylesrender to SVGresulting SVGmeasurements also take place diff --git a/e2etests/testdata/stable/sequence_diagram_real/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_real/elk/board.exp.json index a1170b628..2bec690f8 100644 --- a/e2etests/testdata/stable/sequence_diagram_real/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_real/elk/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -62,6 +63,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -101,6 +103,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -140,6 +143,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -179,6 +183,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -218,6 +223,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -257,6 +263,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -296,6 +303,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -335,6 +343,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": true, "fields": null, "methods": null, "columns": null, @@ -374,6 +383,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": true, "fields": null, "methods": null, "columns": null, @@ -387,7 +397,7 @@ "underline": false, "labelWidth": 185, "labelHeight": 26, - "zIndex": 1, + "zIndex": 3, "level": 2 }, { @@ -412,6 +422,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -425,7 +436,7 @@ "underline": false, "labelWidth": 47, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 3 }, { @@ -450,6 +461,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -489,6 +501,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -528,6 +541,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -541,7 +555,7 @@ "underline": false, "labelWidth": 50, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 3 } ], @@ -1090,7 +1104,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(How this is rendered.d2ast -- )[0]", @@ -1129,7 +1143,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(How this is rendered.d2compiler -- )[0]", @@ -1168,7 +1182,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(How this is rendered.d2layout -- )[0]", @@ -1207,7 +1221,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(How this is rendered.d2exporter -- )[0]", @@ -1246,7 +1260,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(How this is rendered.d2themes -- )[0]", @@ -1285,7 +1299,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(How this is rendered.d2renderer -- )[0]", @@ -1324,7 +1338,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(How this is rendered.d2sequencelayout -- )[0]", @@ -1363,7 +1377,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(How this is rendered.d2dagrelayout -- )[0]", @@ -1402,7 +1416,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 } ] } diff --git a/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg index 58f501629..1a00cde91 100644 --- a/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg @@ -13,8 +13,12 @@ width="2374" height="2488" viewBox="-88 -88 2374 2488">How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutonly if root is not sequence 'How this is rendered: {...}'tokenized ASTcompile ASTobjects and edgesrun layout enginesrun engine on shape: sequence_diagram, temporarily removerun core engine on rest add back in sequence diagramsdiagram with correct positions and dimensionsexport diagram with chosen theme and rendererget theme stylesrender to SVGresulting SVGmeasurements also take place +How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutonly if root is not sequence 'How this is rendered: {...}'tokenized ASTcompile ASTobjects and edgesrun layout enginesrun engine on shape: sequence_diagram, temporarily removerun core engine on rest add back in sequence diagramsdiagram with correct positions and dimensionsexport diagram with chosen theme and rendererget theme stylesrender to SVGresulting SVGmeasurements also take place diff --git a/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/board.exp.json index add1b4166..ce886a711 100644 --- a/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -62,6 +63,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -101,6 +103,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -114,7 +117,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 2 }, { @@ -139,6 +142,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -152,7 +156,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 3 }, { @@ -177,6 +181,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -190,7 +195,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 2 }, { @@ -215,6 +220,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -228,7 +234,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 3 }, { @@ -253,6 +259,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -266,7 +273,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 2 } ], @@ -613,7 +620,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(b -- )[0]", @@ -652,7 +659,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 } ] } diff --git a/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/sketch.exp.svg index f604a0366..a80bfc5fa 100644 --- a/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/sketch.exp.svg @@ -13,6 +13,10 @@ width="666" height="1366" viewBox="-100 -50 666 1366">ab a self edge herebetween actorsto descendantto deeper descendantto parentactor diff --git a/e2etests/testdata/stable/sequence_diagram_self_edges/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_self_edges/elk/board.exp.json index add1b4166..ce886a711 100644 --- a/e2etests/testdata/stable/sequence_diagram_self_edges/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_self_edges/elk/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -62,6 +63,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -101,6 +103,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -114,7 +117,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 2 }, { @@ -139,6 +142,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -152,7 +156,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 3 }, { @@ -177,6 +181,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -190,7 +195,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 2 }, { @@ -215,6 +220,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -228,7 +234,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 3 }, { @@ -253,6 +259,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -266,7 +273,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 2 } ], @@ -613,7 +620,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(b -- )[0]", @@ -652,7 +659,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 } ] } diff --git a/e2etests/testdata/stable/sequence_diagram_self_edges/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_self_edges/elk/sketch.exp.svg index f604a0366..a80bfc5fa 100644 --- a/e2etests/testdata/stable/sequence_diagram_self_edges/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_self_edges/elk/sketch.exp.svg @@ -13,6 +13,10 @@ width="666" height="1366" viewBox="-100 -50 666 1366">ab a self edge herebetween actorsto descendantto deeper descendantto parentactor diff --git a/e2etests/testdata/stable/sequence_diagram_simple/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_simple/dagre/board.exp.json index 83e4e6302..16d4b8a6e 100644 --- a/e2etests/testdata/stable/sequence_diagram_simple/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_simple/dagre/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -62,6 +63,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -101,6 +103,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -140,6 +143,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -179,6 +183,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -625,7 +630,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(bob -- )[0]", @@ -664,7 +669,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(db -- )[0]", @@ -703,7 +708,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(queue -- )[0]", @@ -742,7 +747,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(service -- )[0]", @@ -781,7 +786,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 } ] } diff --git a/e2etests/testdata/stable/sequence_diagram_simple/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_simple/dagre/sketch.exp.svg index 40e95fbe8..0b8022575 100644 --- a/e2etests/testdata/stable/sequence_diagram_simple/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_simple/dagre/sketch.exp.svg @@ -13,6 +13,10 @@ width="1285" height="1868" viewBox="-100 -50 1285 1868">AlicelinebreakerBobdbqueueanoddservicewithanameinmultiple lines Authentication Requestmake request for something that is quite far away and requires a really long label to take all the space between the objectsvalidate credentialsAuthentication ResponseAnother authentication Requestdo it later storedAnother authentication Response diff --git a/e2etests/testdata/stable/sequence_diagram_simple/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_simple/elk/board.exp.json index 83e4e6302..16d4b8a6e 100644 --- a/e2etests/testdata/stable/sequence_diagram_simple/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_simple/elk/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -62,6 +63,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -101,6 +103,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -140,6 +143,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -179,6 +183,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -625,7 +630,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(bob -- )[0]", @@ -664,7 +669,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(db -- )[0]", @@ -703,7 +708,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(queue -- )[0]", @@ -742,7 +747,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(service -- )[0]", @@ -781,7 +786,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 } ] } diff --git a/e2etests/testdata/stable/sequence_diagram_simple/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_simple/elk/sketch.exp.svg index 40e95fbe8..0b8022575 100644 --- a/e2etests/testdata/stable/sequence_diagram_simple/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_simple/elk/sketch.exp.svg @@ -13,6 +13,10 @@ width="1285" height="1868" viewBox="-100 -50 1285 1868">AlicelinebreakerBobdbqueueanoddservicewithanameinmultiple lines Authentication Requestmake request for something that is quite far away and requires a really long label to take all the space between the objectsvalidate credentialsAuthentication ResponseAnother authentication Requestdo it later storedAnother authentication Response diff --git a/e2etests/testdata/stable/sequence_diagram_span/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_span/dagre/board.exp.json index ec7d0c273..77a314e56 100644 --- a/e2etests/testdata/stable/sequence_diagram_span/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_span/dagre/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -62,6 +63,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -75,7 +77,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 2 }, { @@ -100,6 +102,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -139,6 +142,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -152,7 +156,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 2 }, { @@ -177,6 +181,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -216,6 +221,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -229,7 +235,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 2 }, { @@ -254,6 +260,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -293,6 +300,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -306,7 +314,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 2 }, { @@ -331,6 +339,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -344,7 +353,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 3 }, { @@ -369,6 +378,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -408,6 +418,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -421,7 +432,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 2 }, { @@ -446,6 +457,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -485,6 +497,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -498,7 +511,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 2 }, { @@ -523,6 +536,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -536,7 +550,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 2 }, { @@ -561,6 +575,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -574,7 +589,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 2 }, { @@ -599,6 +614,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -612,7 +628,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 2 }, { @@ -637,6 +653,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -650,7 +667,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 2 } ], @@ -1199,7 +1216,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(itemResponse -- )[0]", @@ -1238,7 +1255,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(item -- )[0]", @@ -1277,7 +1294,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(essayRubric -- )[0]", @@ -1316,7 +1333,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(concept -- )[0]", @@ -1355,7 +1372,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(itemOutcome -- )[0]", @@ -1394,7 +1411,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 } ] } diff --git a/e2etests/testdata/stable/sequence_diagram_span/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_span/dagre/sketch.exp.svg index 062ed1eed..1a0f7f184 100644 --- a/e2etests/testdata/stable/sequence_diagram_span/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_span/dagre/sketch.exp.svg @@ -13,6 +13,10 @@ width="1593" height="2146" viewBox="-100 -50 1593 2146">scoreritemResponseitemessayRubricconceptitemOutcome getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) diff --git a/e2etests/testdata/stable/sequence_diagram_span/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_span/elk/board.exp.json index ec7d0c273..77a314e56 100644 --- a/e2etests/testdata/stable/sequence_diagram_span/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_span/elk/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -62,6 +63,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -75,7 +77,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 2 }, { @@ -100,6 +102,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -139,6 +142,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -152,7 +156,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 2 }, { @@ -177,6 +181,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -216,6 +221,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -229,7 +235,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 2 }, { @@ -254,6 +260,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -293,6 +300,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -306,7 +314,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 2 }, { @@ -331,6 +339,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -344,7 +353,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 3 }, { @@ -369,6 +378,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -408,6 +418,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -421,7 +432,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 2 }, { @@ -446,6 +457,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -485,6 +497,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -498,7 +511,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 2 }, { @@ -523,6 +536,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -536,7 +550,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 2 }, { @@ -561,6 +575,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -574,7 +589,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 2 }, { @@ -599,6 +614,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -612,7 +628,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 2 }, { @@ -637,6 +653,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -650,7 +667,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 2 } ], @@ -1199,7 +1216,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(itemResponse -- )[0]", @@ -1238,7 +1255,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(item -- )[0]", @@ -1277,7 +1294,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(essayRubric -- )[0]", @@ -1316,7 +1333,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(concept -- )[0]", @@ -1355,7 +1372,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(itemOutcome -- )[0]", @@ -1394,7 +1411,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 } ] } diff --git a/e2etests/testdata/stable/sequence_diagram_span/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_span/elk/sketch.exp.svg index 062ed1eed..1a0f7f184 100644 --- a/e2etests/testdata/stable/sequence_diagram_span/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_span/elk/sketch.exp.svg @@ -13,6 +13,10 @@ width="1593" height="2146" viewBox="-100 -50 1593 2146">scoreritemResponseitemessayRubricconceptitemOutcome getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) diff --git a/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json index 9416101ce..e3eac2402 100644 --- a/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -62,6 +63,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -101,6 +103,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -140,6 +143,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -179,6 +183,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -218,6 +223,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -257,6 +263,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -296,6 +303,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -335,6 +343,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -374,6 +383,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -413,6 +423,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -452,6 +463,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -491,6 +503,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -530,6 +543,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -543,7 +557,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 3 }, { @@ -568,6 +582,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -607,6 +622,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -620,7 +636,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 3 }, { @@ -645,6 +661,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -684,6 +701,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -697,7 +715,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 3 }, { @@ -722,6 +740,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -761,6 +780,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -774,7 +794,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 3 }, { @@ -799,6 +819,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -812,7 +833,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 4 }, { @@ -837,6 +858,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -876,6 +898,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -889,7 +912,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 3 }, { @@ -914,6 +937,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -953,6 +977,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -966,7 +991,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 3 }, { @@ -991,6 +1016,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1004,7 +1030,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 3 }, { @@ -1029,6 +1055,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1042,7 +1069,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 3 }, { @@ -1067,6 +1094,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1080,7 +1108,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 3 }, { @@ -1105,6 +1133,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1118,7 +1147,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 3 }, { @@ -1143,6 +1172,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1182,6 +1212,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1195,7 +1226,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 4 }, { @@ -1220,6 +1251,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1259,6 +1291,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1272,7 +1305,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 4 }, { @@ -1297,6 +1330,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1336,6 +1370,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1349,7 +1384,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 4 }, { @@ -1374,6 +1409,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1413,6 +1449,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1426,7 +1463,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 4 }, { @@ -1451,6 +1488,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1464,7 +1502,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 5 }, { @@ -1489,6 +1527,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1528,6 +1567,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1541,7 +1581,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 4 }, { @@ -1566,6 +1606,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1605,6 +1646,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1618,7 +1660,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 4 }, { @@ -1643,6 +1685,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1656,7 +1699,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 4 }, { @@ -1681,6 +1724,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1694,7 +1738,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 4 }, { @@ -1719,6 +1763,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1732,7 +1777,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 4 }, { @@ -1757,6 +1802,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1770,7 +1816,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 4 }, { @@ -1795,6 +1841,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1834,6 +1881,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1847,7 +1895,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 4 }, { @@ -1872,6 +1920,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1885,7 +1934,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 4 }, { @@ -1910,6 +1959,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1923,7 +1973,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 5 }, { @@ -1948,6 +1998,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1961,7 +2012,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 4 }, { @@ -1986,6 +2037,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1999,7 +2051,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 5 }, { @@ -2024,6 +2076,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -2037,7 +2090,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 6 }, { @@ -2062,6 +2115,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -2075,7 +2129,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 4 }, { @@ -2100,6 +2154,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -2113,7 +2168,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 5 }, { @@ -2138,6 +2193,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -2151,7 +2207,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 6 }, { @@ -2176,6 +2232,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -2189,7 +2246,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 7 }, { @@ -2214,6 +2271,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -2227,7 +2285,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 4 }, { @@ -2252,6 +2310,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -2265,7 +2324,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 5 }, { @@ -2290,6 +2349,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -2303,7 +2363,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 6 }, { @@ -2328,6 +2388,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -2341,7 +2402,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 7 }, { @@ -2366,6 +2427,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -2379,7 +2441,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 8 }, { @@ -2404,6 +2466,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -2417,7 +2480,7 @@ "underline": false, "labelWidth": 29, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 4 }, { @@ -2442,6 +2505,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -2455,7 +2519,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 4 } ], @@ -4123,7 +4187,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(a_sequence.itemResponse -- )[0]", @@ -4162,7 +4226,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(a_sequence.item -- )[0]", @@ -4201,7 +4265,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(a_sequence.essayRubric -- )[0]", @@ -4240,7 +4304,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(a_sequence.concept -- )[0]", @@ -4279,7 +4343,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(a_sequence.itemOutcome -- )[0]", @@ -4318,7 +4382,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(another.sequence.scorer -- )[0]", @@ -4357,7 +4421,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(another.sequence.itemResponse -- )[0]", @@ -4396,7 +4460,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(another.sequence.item -- )[0]", @@ -4435,7 +4499,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(another.sequence.essayRubric -- )[0]", @@ -4474,7 +4538,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(another.sequence.concept -- )[0]", @@ -4513,7 +4577,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(another.sequence.itemOutcome -- )[0]", @@ -4552,7 +4616,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(finally.sequence.scorer -- )[0]", @@ -4591,7 +4655,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(finally.sequence.concept -- )[0]", @@ -4630,7 +4694,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(finally.sequence.essayRubric -- )[0]", @@ -4669,7 +4733,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(finally.sequence.item -- )[0]", @@ -4708,7 +4772,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(finally.sequence.itemOutcome -- )[0]", @@ -4747,7 +4811,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(finally.sequence.itemResponse -- )[0]", @@ -4786,7 +4850,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 } ] } diff --git a/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg index 5c7e8ffd3..25f5aa192 100644 --- a/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg @@ -13,6 +13,10 @@ width="3244" height="4173" viewBox="-100 -100 3244 4173">a_shapea_sequenceanotherfinallysequencesequencesequencescoreritemResponseitemessayRubricconceptitemOutcomescorerconceptessayRubricitemitemOutcomeitemResponsescoreritemResponseitemessayRubricconceptitemOutcome getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts)getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) diff --git a/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json index 65f9beec9..005c6a567 100644 --- a/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -62,6 +63,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -101,6 +103,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -140,6 +143,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -179,6 +183,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -218,6 +223,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -257,6 +263,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -296,6 +303,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -335,6 +343,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -374,6 +383,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -413,6 +423,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -452,6 +463,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -491,6 +503,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -530,6 +543,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -543,7 +557,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 3 }, { @@ -568,6 +582,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -607,6 +622,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -620,7 +636,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 3 }, { @@ -645,6 +661,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -684,6 +701,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -697,7 +715,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 3 }, { @@ -722,6 +740,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -761,6 +780,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -774,7 +794,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 3 }, { @@ -799,6 +819,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -812,7 +833,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 4 }, { @@ -837,6 +858,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -876,6 +898,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -889,7 +912,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 3 }, { @@ -914,6 +937,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -953,6 +977,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -966,7 +991,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 3 }, { @@ -991,6 +1016,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1004,7 +1030,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 3 }, { @@ -1029,6 +1055,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1042,7 +1069,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 3 }, { @@ -1067,6 +1094,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1080,7 +1108,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 3 }, { @@ -1105,6 +1133,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1118,7 +1147,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 3 }, { @@ -1143,6 +1172,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1182,6 +1212,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1195,7 +1226,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 4 }, { @@ -1220,6 +1251,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1259,6 +1291,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1272,7 +1305,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 4 }, { @@ -1297,6 +1330,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1336,6 +1370,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1349,7 +1384,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 4 }, { @@ -1374,6 +1409,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1413,6 +1449,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1426,7 +1463,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 4 }, { @@ -1451,6 +1488,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1464,7 +1502,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 5 }, { @@ -1489,6 +1527,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1528,6 +1567,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1541,7 +1581,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 4 }, { @@ -1566,6 +1606,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1605,6 +1646,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1618,7 +1660,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 4 }, { @@ -1643,6 +1685,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1656,7 +1699,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 4 }, { @@ -1681,6 +1724,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1694,7 +1738,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 4 }, { @@ -1719,6 +1763,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1732,7 +1777,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 4 }, { @@ -1757,6 +1802,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1770,7 +1816,7 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 4 }, { @@ -1795,6 +1841,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1834,6 +1881,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1847,7 +1895,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 4 }, { @@ -1872,6 +1920,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1885,7 +1934,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 4 }, { @@ -1910,6 +1959,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1923,7 +1973,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 5 }, { @@ -1948,6 +1998,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1961,7 +2012,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 4 }, { @@ -1986,6 +2037,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1999,7 +2051,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 5 }, { @@ -2024,6 +2076,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -2037,7 +2090,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 6 }, { @@ -2062,6 +2115,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -2075,7 +2129,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 4 }, { @@ -2100,6 +2154,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -2113,7 +2168,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 5 }, { @@ -2138,6 +2193,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -2151,7 +2207,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 6 }, { @@ -2176,6 +2232,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -2189,7 +2246,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 7 }, { @@ -2214,6 +2271,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -2227,7 +2285,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 4 }, { @@ -2252,6 +2310,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -2265,7 +2324,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 5 }, { @@ -2290,6 +2349,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -2303,7 +2363,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 6 }, { @@ -2328,6 +2388,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -2341,7 +2402,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 7 }, { @@ -2366,6 +2427,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -2379,7 +2441,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 8 }, { @@ -2404,6 +2466,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -2417,7 +2480,7 @@ "underline": false, "labelWidth": 29, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 4 }, { @@ -2442,6 +2505,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -2455,7 +2519,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 4 } ], @@ -4042,7 +4106,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(a_sequence.itemResponse -- )[0]", @@ -4081,7 +4145,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(a_sequence.item -- )[0]", @@ -4120,7 +4184,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(a_sequence.essayRubric -- )[0]", @@ -4159,7 +4223,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(a_sequence.concept -- )[0]", @@ -4198,7 +4262,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(a_sequence.itemOutcome -- )[0]", @@ -4237,7 +4301,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(another.sequence.scorer -- )[0]", @@ -4276,7 +4340,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(another.sequence.itemResponse -- )[0]", @@ -4315,7 +4379,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(another.sequence.item -- )[0]", @@ -4354,7 +4418,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(another.sequence.essayRubric -- )[0]", @@ -4393,7 +4457,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(another.sequence.concept -- )[0]", @@ -4432,7 +4496,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(another.sequence.itemOutcome -- )[0]", @@ -4471,7 +4535,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(finally.sequence.scorer -- )[0]", @@ -4510,7 +4574,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(finally.sequence.concept -- )[0]", @@ -4549,7 +4613,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(finally.sequence.essayRubric -- )[0]", @@ -4588,7 +4652,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(finally.sequence.item -- )[0]", @@ -4627,7 +4691,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(finally.sequence.itemOutcome -- )[0]", @@ -4666,7 +4730,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(finally.sequence.itemResponse -- )[0]", @@ -4705,7 +4769,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 } ] } diff --git a/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg index c37e331bd..3a7627648 100644 --- a/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg @@ -13,6 +13,10 @@ width="3166" height="4293" viewBox="-88 -88 3166 4293">a_shapea_sequenceanotherfinallysequencesequencesequencescoreritemResponseitemessayRubricconceptitemOutcomescorerconceptessayRubricitemitemOutcomeitemResponsescoreritemResponseitemessayRubricconceptitemOutcome getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts)getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) diff --git a/e2etests/testdata/stable/sql_tables/dagre/board.exp.json b/e2etests/testdata/stable/sql_tables/dagre/board.exp.json index e4f5b8038..b6e0dfc1d 100644 --- a/e2etests/testdata/stable/sql_tables/dagre/board.exp.json +++ b/e2etests/testdata/stable/sql_tables/dagre/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": [ @@ -92,6 +93,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": [ @@ -155,6 +157,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": [ @@ -212,6 +215,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": [ diff --git a/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg b/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg index 38c496a68..0c338a4cb 100644 --- a/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg @@ -13,6 +13,10 @@ width="1162" height="660" viewBox="-100 -100 1162 660">usersid int diff --git a/e2etests/testdata/stable/sql_tables/elk/board.exp.json b/e2etests/testdata/stable/sql_tables/elk/board.exp.json index 4580c1251..2734f02ca 100644 --- a/e2etests/testdata/stable/sql_tables/elk/board.exp.json +++ b/e2etests/testdata/stable/sql_tables/elk/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": [ @@ -92,6 +93,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": [ @@ -155,6 +157,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": [ @@ -212,6 +215,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": [ diff --git a/e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg b/e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg index 82f2f84a6..83676385c 100644 --- a/e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg @@ -13,6 +13,10 @@ width="1082" height="660" viewBox="-88 -88 1082 660">usersid int diff --git a/e2etests/testdata/stable/square_3d/dagre/board.exp.json b/e2etests/testdata/stable/square_3d/dagre/board.exp.json index 1271b3d7c..8a037500b 100644 --- a/e2etests/testdata/stable/square_3d/dagre/board.exp.json +++ b/e2etests/testdata/stable/square_3d/dagre/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -62,6 +63,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, diff --git a/e2etests/testdata/stable/square_3d/dagre/sketch.exp.svg b/e2etests/testdata/stable/square_3d/dagre/sketch.exp.svg index 0ccdd04b2..c0c23fd03 100644 --- a/e2etests/testdata/stable/square_3d/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/square_3d/dagre/sketch.exp.svg @@ -13,6 +13,10 @@ width="371" height="580" viewBox="-100 -100 371 580"> diff --git a/e2etests/testdata/stable/square_3d/elk/board.exp.json b/e2etests/testdata/stable/square_3d/elk/board.exp.json index e2493608c..e7bf89b84 100644 --- a/e2etests/testdata/stable/square_3d/elk/board.exp.json +++ b/e2etests/testdata/stable/square_3d/elk/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -62,6 +63,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, diff --git a/e2etests/testdata/stable/square_3d/elk/sketch.exp.svg b/e2etests/testdata/stable/square_3d/elk/sketch.exp.svg index 79cb89863..eac82185e 100644 --- a/e2etests/testdata/stable/square_3d/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/square_3d/elk/sketch.exp.svg @@ -13,6 +13,10 @@ width="371" height="580" viewBox="-88 -88 371 580"> diff --git a/e2etests/testdata/stable/straight_hierarchy_container/dagre/board.exp.json b/e2etests/testdata/stable/straight_hierarchy_container/dagre/board.exp.json index e08955990..00913a3e3 100644 --- a/e2etests/testdata/stable/straight_hierarchy_container/dagre/board.exp.json +++ b/e2etests/testdata/stable/straight_hierarchy_container/dagre/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -62,6 +63,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -101,6 +103,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -140,6 +143,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -179,6 +183,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -218,6 +223,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -257,6 +263,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -296,6 +303,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -335,6 +343,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -374,6 +383,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -413,6 +423,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -452,6 +463,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -491,6 +503,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -530,6 +543,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -569,6 +583,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -608,6 +623,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -647,6 +663,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -686,6 +703,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -725,6 +743,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -764,6 +783,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -803,6 +823,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -842,6 +863,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -881,6 +903,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -920,6 +943,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -959,6 +983,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, diff --git a/e2etests/testdata/stable/straight_hierarchy_container/dagre/sketch.exp.svg b/e2etests/testdata/stable/straight_hierarchy_container/dagre/sketch.exp.svg index 1a5168cc1..4deaf1d99 100644 --- a/e2etests/testdata/stable/straight_hierarchy_container/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/straight_hierarchy_container/dagre/sketch.exp.svg @@ -13,6 +13,10 @@ width="999" height="1730" viewBox="-100 -100 999 1730">acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc diff --git a/e2etests/testdata/stable/stylish/elk/board.exp.json b/e2etests/testdata/stable/stylish/elk/board.exp.json index 7df611198..0cd252c22 100644 --- a/e2etests/testdata/stable/stylish/elk/board.exp.json +++ b/e2etests/testdata/stable/stylish/elk/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -62,6 +63,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, diff --git a/e2etests/testdata/stable/stylish/elk/sketch.exp.svg b/e2etests/testdata/stable/stylish/elk/sketch.exp.svg index da08d2875..13fba9861 100644 --- a/e2etests/testdata/stable/stylish/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/stylish/elk/sketch.exp.svg @@ -13,6 +13,10 @@ width="314" height="552" viewBox="-88 -88 314 552"> diff --git a/e2etests/testdata/stable/transparent_3d/dagre/board.exp.json b/e2etests/testdata/stable/transparent_3d/dagre/board.exp.json index f2de4f323..c19a78f8f 100644 --- a/e2etests/testdata/stable/transparent_3d/dagre/board.exp.json +++ b/e2etests/testdata/stable/transparent_3d/dagre/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, diff --git a/e2etests/testdata/stable/transparent_3d/dagre/sketch.exp.svg b/e2etests/testdata/stable/transparent_3d/dagre/sketch.exp.svg index 9fed45499..1a7a77d81 100644 --- a/e2etests/testdata/stable/transparent_3d/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/transparent_3d/dagre/sketch.exp.svg @@ -13,6 +13,10 @@ width="339" height="326" viewBox="-100 -100 339 326"> diff --git a/e2etests/testdata/stable/transparent_3d/elk/board.exp.json b/e2etests/testdata/stable/transparent_3d/elk/board.exp.json index 41cb8cf6f..cbdf1ca4e 100644 --- a/e2etests/testdata/stable/transparent_3d/elk/board.exp.json +++ b/e2etests/testdata/stable/transparent_3d/elk/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, diff --git a/e2etests/testdata/stable/transparent_3d/elk/sketch.exp.svg b/e2etests/testdata/stable/transparent_3d/elk/sketch.exp.svg index e5e521a73..b795f5be6 100644 --- a/e2etests/testdata/stable/transparent_3d/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/transparent_3d/elk/sketch.exp.svg @@ -13,6 +13,10 @@ width="339" height="326" viewBox="-88 -88 339 326"> diff --git a/e2etests/testdata/stable/us_map/dagre/board.exp.json b/e2etests/testdata/stable/us_map/dagre/board.exp.json index b5ba0c1f4..6deece116 100644 --- a/e2etests/testdata/stable/us_map/dagre/board.exp.json +++ b/e2etests/testdata/stable/us_map/dagre/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -62,6 +63,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -101,6 +103,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -140,6 +143,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -179,6 +183,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -218,6 +223,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -257,6 +263,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -296,6 +303,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -335,6 +343,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -374,6 +383,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -413,6 +423,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -452,6 +463,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -491,6 +503,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -530,6 +543,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -569,6 +583,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -608,6 +623,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -647,6 +663,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -686,6 +703,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -725,6 +743,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -764,6 +783,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -803,6 +823,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -842,6 +863,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -881,6 +903,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -920,6 +943,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -959,6 +983,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -998,6 +1023,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1037,6 +1063,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1076,6 +1103,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1115,6 +1143,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1154,6 +1183,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1193,6 +1223,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1232,6 +1263,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1271,6 +1303,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1310,6 +1343,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1349,6 +1383,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1388,6 +1423,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1427,6 +1463,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1466,6 +1503,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1505,6 +1543,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1544,6 +1583,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1583,6 +1623,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1622,6 +1663,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1661,6 +1703,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1700,6 +1743,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1739,6 +1783,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1778,6 +1823,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1817,6 +1863,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1856,6 +1903,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1895,6 +1943,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -1934,6 +1983,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, diff --git a/e2etests/testdata/stable/us_map/dagre/sketch.exp.svg b/e2etests/testdata/stable/us_map/dagre/sketch.exp.svg index 3f27041e4..6b5170205 100644 --- a/e2etests/testdata/stable/us_map/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/us_map/dagre/sketch.exp.svg @@ -13,6 +13,10 @@ width="3322" height="2812" viewBox="-100 -100 3322 2812">AKHIALFLGAMSTNAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTNDAKHIALFLGAMSTNAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTNDcontainerfirstsecond 1->2c->2 diff --git a/e2etests/testdata/todo/container_child_edge/elk/board.exp.json b/e2etests/testdata/todo/container_child_edge/elk/board.exp.json index 251a3afc2..35b0e5dd0 100644 --- a/e2etests/testdata/todo/container_child_edge/elk/board.exp.json +++ b/e2etests/testdata/todo/container_child_edge/elk/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -62,6 +63,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -101,6 +103,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, diff --git a/e2etests/testdata/todo/container_child_edge/elk/sketch.exp.svg b/e2etests/testdata/todo/container_child_edge/elk/sketch.exp.svg index 74e591fac..a08856cdb 100644 --- a/e2etests/testdata/todo/container_child_edge/elk/sketch.exp.svg +++ b/e2etests/testdata/todo/container_child_edge/elk/sketch.exp.svg @@ -13,6 +13,10 @@ width="536" height="663" viewBox="-88 -88 536 663">containerfirstsecond 1->2c->2 diff --git a/e2etests/testdata/todo/font_sizes_containers_large/dagre/board.exp.json b/e2etests/testdata/todo/font_sizes_containers_large/dagre/board.exp.json index 3928b93ed..f3951de5d 100644 --- a/e2etests/testdata/todo/font_sizes_containers_large/dagre/board.exp.json +++ b/e2etests/testdata/todo/font_sizes_containers_large/dagre/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -62,6 +63,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -101,6 +103,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -140,6 +143,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -179,6 +183,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, diff --git a/e2etests/testdata/todo/font_sizes_containers_large/dagre/sketch.exp.svg b/e2etests/testdata/todo/font_sizes_containers_large/dagre/sketch.exp.svg index f3e3f7b1a..250e39b0a 100644 --- a/e2etests/testdata/todo/font_sizes_containers_large/dagre/sketch.exp.svg +++ b/e2etests/testdata/todo/font_sizes_containers_large/dagre/sketch.exp.svg @@ -13,6 +13,10 @@ width="664" height="716" viewBox="-100 -100 664 716">ninety ninesixty fourthirty twosixteeneightninety ninesixty fourthirty twosixteeneighteightsixteenthirty twosixty fourninety nine twelvetwenty fourforty eighteighty one diff --git a/e2etests/testdata/todo/font_sizes_large/elk/board.exp.json b/e2etests/testdata/todo/font_sizes_large/elk/board.exp.json index 03661ef73..d012e76be 100644 --- a/e2etests/testdata/todo/font_sizes_large/elk/board.exp.json +++ b/e2etests/testdata/todo/font_sizes_large/elk/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -62,6 +63,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -101,6 +103,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -140,6 +143,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -179,6 +183,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, diff --git a/e2etests/testdata/todo/font_sizes_large/elk/sketch.exp.svg b/e2etests/testdata/todo/font_sizes_large/elk/sketch.exp.svg index 0a92d5cc1..1fc75eb20 100644 --- a/e2etests/testdata/todo/font_sizes_large/elk/sketch.exp.svg +++ b/e2etests/testdata/todo/font_sizes_large/elk/sketch.exp.svg @@ -13,6 +13,10 @@ width="789" height="2014" viewBox="-39 -88 789 2014">eightsixteenthirty twosixty fourninety nine twelvetwenty fourforty eighteighty one diff --git a/e2etests/testdata/todo/tall_edge_label/dagre/board.exp.json b/e2etests/testdata/todo/tall_edge_label/dagre/board.exp.json index 4f763c08b..4050c622f 100644 --- a/e2etests/testdata/todo/tall_edge_label/dagre/board.exp.json +++ b/e2etests/testdata/todo/tall_edge_label/dagre/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -62,6 +63,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, diff --git a/e2etests/testdata/todo/tall_edge_label/dagre/sketch.exp.svg b/e2etests/testdata/todo/tall_edge_label/dagre/sketch.exp.svg index 9077c2058..6f91b89c2 100644 --- a/e2etests/testdata/todo/tall_edge_label/dagre/sketch.exp.svg +++ b/e2etests/testdata/todo/tall_edge_label/dagre/sketch.exp.svg @@ -13,6 +13,10 @@ width="313" height="552" viewBox="-100 -100 313 552">ab Thereoncewasaverytalledgelabel diff --git a/e2etests/testdata/todo/tall_edge_label/elk/board.exp.json b/e2etests/testdata/todo/tall_edge_label/elk/board.exp.json index 1d7e56a74..be7edc7f0 100644 --- a/e2etests/testdata/todo/tall_edge_label/elk/board.exp.json +++ b/e2etests/testdata/todo/tall_edge_label/elk/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -62,6 +63,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, diff --git a/e2etests/testdata/todo/tall_edge_label/elk/sketch.exp.svg b/e2etests/testdata/todo/tall_edge_label/elk/sketch.exp.svg index b270e215c..94bbf2b26 100644 --- a/e2etests/testdata/todo/tall_edge_label/elk/sketch.exp.svg +++ b/e2etests/testdata/todo/tall_edge_label/elk/sketch.exp.svg @@ -13,6 +13,10 @@ width="313" height="785" viewBox="-88 -88 313 785">ab Thereoncewasaverytalledgelabel From bed4ef7fae6c38fefa1e2887eaa3315c37ee22c9 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Mon, 5 Dec 2022 11:36:19 -0800 Subject: [PATCH 2/3] fix group classification --- d2graph/seqdiagram.go | 24 ++++++++++++++++++- d2renderers/d2svg/style.css | 1 - .../sanity/1_to_2/dagre/sketch.exp.svg | 1 - .../testdata/sanity/1_to_2/elk/sketch.exp.svg | 1 - .../sanity/basic/dagre/sketch.exp.svg | 1 - .../testdata/sanity/basic/elk/sketch.exp.svg | 1 - .../child_to_child/dagre/sketch.exp.svg | 1 - .../sanity/child_to_child/elk/sketch.exp.svg | 1 - .../connection_label/dagre/sketch.exp.svg | 1 - .../connection_label/elk/sketch.exp.svg | 1 - .../sanity/empty/dagre/sketch.exp.svg | 1 - .../testdata/sanity/empty/elk/sketch.exp.svg | 1 - .../stable/all_shapes/dagre/sketch.exp.svg | 1 - .../stable/all_shapes/elk/sketch.exp.svg | 1 - .../all_shapes_multiple/dagre/sketch.exp.svg | 1 - .../all_shapes_multiple/elk/sketch.exp.svg | 1 - .../all_shapes_shadow/dagre/sketch.exp.svg | 1 - .../all_shapes_shadow/elk/sketch.exp.svg | 1 - .../arrowhead_adjustment/dagre/sketch.exp.svg | 1 - .../arrowhead_adjustment/elk/sketch.exp.svg | 1 - .../arrowhead_labels/dagre/sketch.exp.svg | 1 - .../arrowhead_labels/elk/sketch.exp.svg | 1 - .../stable/binary_tree/dagre/sketch.exp.svg | 1 - .../stable/binary_tree/elk/sketch.exp.svg | 1 - .../stable/chaos1/dagre/sketch.exp.svg | 1 - .../testdata/stable/chaos1/elk/sketch.exp.svg | 1 - .../stable/chaos2/dagre/sketch.exp.svg | 1 - .../testdata/stable/chaos2/elk/sketch.exp.svg | 1 - .../child_parent_edges/dagre/sketch.exp.svg | 1 - .../child_parent_edges/elk/sketch.exp.svg | 1 - .../circular_dependency/dagre/sketch.exp.svg | 1 - .../circular_dependency/elk/sketch.exp.svg | 1 - .../stable/class/dagre/sketch.exp.svg | 1 - .../testdata/stable/class/elk/sketch.exp.svg | 1 - .../stable/code_snippet/dagre/sketch.exp.svg | 1 - .../stable/code_snippet/elk/sketch.exp.svg | 1 - .../connected_container/dagre/sketch.exp.svg | 1 - .../connected_container/elk/sketch.exp.svg | 1 - .../container_edges/dagre/sketch.exp.svg | 1 - .../stable/container_edges/elk/sketch.exp.svg | 1 - .../stable/dense/dagre/sketch.exp.svg | 1 - .../testdata/stable/dense/elk/sketch.exp.svg | 1 - .../different_subgraphs/dagre/sketch.exp.svg | 1 - .../different_subgraphs/elk/sketch.exp.svg | 1 - .../stable/direction/dagre/sketch.exp.svg | 1 - .../stable/direction/elk/sketch.exp.svg | 1 - .../stable/font_colors/dagre/sketch.exp.svg | 1 - .../stable/font_colors/elk/sketch.exp.svg | 1 - .../stable/font_sizes/dagre/sketch.exp.svg | 1 - .../stable/font_sizes/elk/sketch.exp.svg | 1 - .../giant_markdown_test/dagre/sketch.exp.svg | 1 - .../giant_markdown_test/elk/sketch.exp.svg | 1 - .../testdata/stable/hr/dagre/sketch.exp.svg | 1 - .../testdata/stable/hr/elk/sketch.exp.svg | 1 - .../stable/icon-label/dagre/sketch.exp.svg | 1 - .../stable/icon-label/elk/sketch.exp.svg | 1 - .../stable/images/dagre/sketch.exp.svg | 1 - .../testdata/stable/images/elk/sketch.exp.svg | 1 - .../stable/investigate/dagre/sketch.exp.svg | 1 - .../stable/investigate/elk/sketch.exp.svg | 1 - .../stable/large_arch/dagre/sketch.exp.svg | 1 - .../stable/large_arch/elk/sketch.exp.svg | 1 - .../stable/latex/dagre/sketch.exp.svg | 1 - .../testdata/stable/latex/elk/sketch.exp.svg | 1 - .../testdata/stable/li1/dagre/sketch.exp.svg | 1 - .../testdata/stable/li1/elk/sketch.exp.svg | 1 - .../testdata/stable/li2/dagre/sketch.exp.svg | 1 - .../testdata/stable/li2/elk/sketch.exp.svg | 1 - .../testdata/stable/li3/dagre/sketch.exp.svg | 1 - .../testdata/stable/li3/elk/sketch.exp.svg | 1 - .../testdata/stable/li4/dagre/sketch.exp.svg | 1 - .../testdata/stable/li4/elk/sketch.exp.svg | 1 - .../stable/lone_h1/dagre/sketch.exp.svg | 1 - .../stable/lone_h1/elk/sketch.exp.svg | 1 - .../stable/markdown/dagre/sketch.exp.svg | 1 - .../stable/markdown/elk/sketch.exp.svg | 1 - .../md_2space_newline/dagre/sketch.exp.svg | 1 - .../md_2space_newline/elk/sketch.exp.svg | 1 - .../md_backslash_newline/dagre/sketch.exp.svg | 1 - .../md_backslash_newline/elk/sketch.exp.svg | 1 - .../md_code_block_fenced/dagre/sketch.exp.svg | 1 - .../md_code_block_fenced/elk/sketch.exp.svg | 1 - .../dagre/sketch.exp.svg | 1 - .../md_code_block_indented/elk/sketch.exp.svg | 1 - .../md_code_inline/dagre/sketch.exp.svg | 1 - .../stable/md_code_inline/elk/sketch.exp.svg | 1 - .../multiline_text/dagre/sketch.exp.svg | 1 - .../stable/multiline_text/elk/sketch.exp.svg | 1 - .../multiple_trees/dagre/sketch.exp.svg | 1 - .../stable/multiple_trees/elk/sketch.exp.svg | 1 - .../stable/n22_e32/dagre/sketch.exp.svg | 1 - .../stable/n22_e32/elk/sketch.exp.svg | 1 - .../number_connections/dagre/sketch.exp.svg | 1 - .../number_connections/elk/sketch.exp.svg | 1 - .../one_container_loop/dagre/sketch.exp.svg | 1 - .../one_container_loop/elk/sketch.exp.svg | 1 - .../dagre/sketch.exp.svg | 1 - .../elk/sketch.exp.svg | 1 - .../testdata/stable/p/dagre/sketch.exp.svg | 1 - e2etests/testdata/stable/p/elk/sketch.exp.svg | 1 - .../testdata/stable/pre/dagre/sketch.exp.svg | 1 - .../testdata/stable/pre/elk/sketch.exp.svg | 1 - .../self-referencing/dagre/sketch.exp.svg | 1 - .../self-referencing/elk/sketch.exp.svg | 1 - .../dagre/sketch.exp.svg | 1 - .../elk/sketch.exp.svg | 1 - .../dagre/board.exp.json | 4 ++-- .../dagre/sketch.exp.svg | 3 +-- .../elk/board.exp.json | 4 ++-- .../elk/sketch.exp.svg | 3 +-- .../dagre/sketch.exp.svg | 1 - .../elk/sketch.exp.svg | 1 - .../dagre/board.exp.json | 8 +++---- .../dagre/sketch.exp.svg | 3 +-- .../sequence_diagram_note/elk/board.exp.json | 8 +++---- .../sequence_diagram_note/elk/sketch.exp.svg | 3 +-- .../dagre/board.exp.json | 2 +- .../dagre/sketch.exp.svg | 3 +-- .../sequence_diagram_real/elk/board.exp.json | 2 +- .../sequence_diagram_real/elk/sketch.exp.svg | 3 +-- .../dagre/sketch.exp.svg | 1 - .../elk/sketch.exp.svg | 1 - .../dagre/sketch.exp.svg | 1 - .../elk/sketch.exp.svg | 1 - .../dagre/sketch.exp.svg | 1 - .../sequence_diagram_span/elk/sketch.exp.svg | 1 - .../sequence_diagrams/dagre/sketch.exp.svg | 1 - .../sequence_diagrams/elk/sketch.exp.svg | 1 - .../stable/sql_tables/dagre/sketch.exp.svg | 1 - .../stable/sql_tables/elk/sketch.exp.svg | 1 - .../stable/square_3d/dagre/sketch.exp.svg | 1 - .../stable/square_3d/elk/sketch.exp.svg | 1 - .../dagre/sketch.exp.svg | 1 - .../elk/sketch.exp.svg | 1 - .../stable/stylish/dagre/sketch.exp.svg | 1 - .../stable/stylish/elk/sketch.exp.svg | 1 - .../transparent_3d/dagre/sketch.exp.svg | 1 - .../stable/transparent_3d/elk/sketch.exp.svg | 1 - .../stable/us_map/dagre/sketch.exp.svg | 1 - .../testdata/stable/us_map/elk/sketch.exp.svg | 1 - .../container_child_edge/dagre/sketch.exp.svg | 1 - .../container_child_edge/elk/sketch.exp.svg | 1 - .../dagre/sketch.exp.svg | 1 - .../elk/sketch.exp.svg | 1 - .../font_sizes_large/dagre/sketch.exp.svg | 1 - .../todo/font_sizes_large/elk/sketch.exp.svg | 1 - .../todo/tall_edge_label/dagre/sketch.exp.svg | 1 - .../todo/tall_edge_label/elk/sketch.exp.svg | 1 - 148 files changed, 43 insertions(+), 162 deletions(-) diff --git a/d2graph/seqdiagram.go b/d2graph/seqdiagram.go index bc40d387b..649756a41 100644 --- a/d2graph/seqdiagram.go +++ b/d2graph/seqdiagram.go @@ -33,7 +33,7 @@ func (obj *Object) IsSequenceDiagramGroup() bool { return false } } - return true + return obj.ContainsAnyObject(obj.Graph.Objects) || obj.ContainsAnyEdge(obj.Graph.Edges) } // notes are descendant of actors with no edges and no children @@ -54,6 +54,28 @@ func (obj *Object) hasEdgeRef() bool { return false } +func (obj *Object) ContainsAnyObject(objects []*Object) bool { + for _, o := range objects { + if o.ContainedBy(obj) { + return true + } + } + return false +} + +func (o *Object) ContainedBy(obj *Object) bool { + for _, ref := range o.References { + curr := ref.UnresolvedScopeObj + for curr != nil { + if curr == obj { + return true + } + curr = curr.Parent + } + } + return false +} + func (obj *Object) ContainsAnyEdge(edges []*Edge) bool { for _, e := range edges { if e.ContainedBy(obj) { diff --git a/d2renderers/d2svg/style.css b/d2renderers/d2svg/style.css index 0068533c5..e07084d0f 100644 --- a/d2renderers/d2svg/style.css +++ b/d2renderers/d2svg/style.css @@ -6,7 +6,6 @@ stroke-linecap: round; stroke-linejoin: round; } - .blend { mix-blend-mode: multiply; } diff --git a/e2etests/testdata/sanity/1_to_2/dagre/sketch.exp.svg b/e2etests/testdata/sanity/1_to_2/dagre/sketch.exp.svg index 1ff7bb178..4e499dd8c 100644 --- a/e2etests/testdata/sanity/1_to_2/dagre/sketch.exp.svg +++ b/e2etests/testdata/sanity/1_to_2/dagre/sketch.exp.svg @@ -12,7 +12,6 @@ width="486" height="552" viewBox="-100 -100 486 552">abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note +abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note diff --git a/e2etests/testdata/stable/sequence_diagram_groups/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_groups/elk/board.exp.json index 49d702816..57883e022 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_groups/elk/board.exp.json @@ -339,7 +339,7 @@ "link": "", "icon": null, "iconPosition": "", - "blend": true, + "blend": false, "fields": null, "methods": null, "columns": null, @@ -418,7 +418,7 @@ "link": "", "icon": null, "iconPosition": "", - "blend": true, + "blend": false, "fields": null, "methods": null, "columns": null, diff --git a/e2etests/testdata/stable/sequence_diagram_groups/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_groups/elk/sketch.exp.svg index 42148947f..47a70e507 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_groups/elk/sketch.exp.svg @@ -12,13 +12,12 @@ width="1057" height="2268" viewBox="-100 -50 1057 2268">abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note +abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note diff --git a/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/sketch.exp.svg index 4d41134f1..f1ab7fd85 100644 --- a/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/sketch.exp.svg @@ -12,7 +12,6 @@ width="1593" height="1626" viewBox="-100 -50 1593 1626">abcd okayexplanationanother explanationSome one who believes imaginary things appear right before your i's.The earth is like a tiny grain of sand, only much, much heavier +abcd okayexplanationanother explanationSome one who believes imaginary things appear right before your i's.The earth is like a tiny grain of sand, only much, much heavier abcd okayexplanationanother explanationSome one who believes imaginary things appear right before your i's.The earth is like a tiny grain of sand, only much, much heavier +abcd okayexplanationanother explanationSome one who believes imaginary things appear right before your i's.The earth is like a tiny grain of sand, only much, much heavier How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutonly if root is not sequence 'How this is rendered: {...}'tokenized ASTcompile ASTobjects and edgesrun layout enginesrun engine on shape: sequence_diagram, temporarily removerun core engine on rest add back in sequence diagramsdiagram with correct positions and dimensionsexport diagram with chosen theme and rendererget theme stylesrender to SVGresulting SVGmeasurements also take place +How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutonly if root is not sequence 'How this is rendered: {...}'tokenized ASTcompile ASTobjects and edgesrun layout enginesrun engine on shape: sequence_diagram, temporarily removerun core engine on rest add back in sequence diagramsdiagram with correct positions and dimensionsexport diagram with chosen theme and rendererget theme stylesrender to SVGresulting SVGmeasurements also take place diff --git a/e2etests/testdata/stable/sequence_diagram_real/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_real/elk/board.exp.json index 2bec690f8..494c31964 100644 --- a/e2etests/testdata/stable/sequence_diagram_real/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_real/elk/board.exp.json @@ -343,7 +343,7 @@ "link": "", "icon": null, "iconPosition": "", - "blend": true, + "blend": false, "fields": null, "methods": null, "columns": null, diff --git a/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg index 1a00cde91..d96000897 100644 --- a/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg @@ -12,13 +12,12 @@ width="2374" height="2488" viewBox="-88 -88 2374 2488">How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutonly if root is not sequence 'How this is rendered: {...}'tokenized ASTcompile ASTobjects and edgesrun layout enginesrun engine on shape: sequence_diagram, temporarily removerun core engine on rest add back in sequence diagramsdiagram with correct positions and dimensionsexport diagram with chosen theme and rendererget theme stylesrender to SVGresulting SVGmeasurements also take place +How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutonly if root is not sequence 'How this is rendered: {...}'tokenized ASTcompile ASTobjects and edgesrun layout enginesrun engine on shape: sequence_diagram, temporarily removerun core engine on rest add back in sequence diagramsdiagram with correct positions and dimensionsexport diagram with chosen theme and rendererget theme stylesrender to SVGresulting SVGmeasurements also take place diff --git a/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/sketch.exp.svg index a80bfc5fa..8e5a98c71 100644 --- a/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/sketch.exp.svg @@ -12,7 +12,6 @@ width="666" height="1366" viewBox="-100 -50 666 1366">rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud aabbccddllffwwyynniijjkkssuurmeemmmmgghhzzooppqqrrttvvxxabac 123456 +aabbccddllffwwyynniijjkkssuurmeemmmmgghhzzooppqqrrttvvxxabac 123456 diff --git a/e2etests/testdata/stable/investigate/elk/board.exp.json b/e2etests/testdata/stable/investigate/elk/board.exp.json index 19c07f20c..6e983b96d 100644 --- a/e2etests/testdata/stable/investigate/elk/board.exp.json +++ b/e2etests/testdata/stable/investigate/elk/board.exp.json @@ -454,7 +454,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F0F3F9", + "fill": "#DEE1EB", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -545,7 +545,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F0F3F9", + "fill": "#DEE1EB", "stroke": "#0D32B2", "shadow": false, "3d": false, diff --git a/e2etests/testdata/stable/investigate/elk/sketch.exp.svg b/e2etests/testdata/stable/investigate/elk/sketch.exp.svg index df2c32fbb..6655cd820 100644 --- a/e2etests/testdata/stable/investigate/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/investigate/elk/sketch.exp.svg @@ -14,10 +14,11 @@ width="860" height="4868" viewBox="-82 -88 860 4868">aabbccddllffwwyynniijjkkssuurmeemmmmgghhzzooppqqrrttvvxxabac 123456 +aabbccddllffwwyynniijjkkssuurmeemmmmgghhzzooppqqrrttvvxxabac 123456 diff --git a/e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg b/e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg index bc6ebed4a..13eab90b5 100644 --- a/e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg @@ -14,6 +14,7 @@ width="3244" height="1780" viewBox="-100 -100 3244 1780">abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note +abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note diff --git a/e2etests/testdata/stable/sequence_diagram_groups/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_groups/elk/board.exp.json index 57883e022..c0dc10419 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_groups/elk/board.exp.json @@ -172,9 +172,9 @@ "height": 80, "opacity": 1, "strokeDash": 0, - "strokeWidth": 2, + "strokeWidth": 0, "borderRadius": 0, - "fill": "#EDF0FD", + "fill": "#DEE1EB", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -211,9 +211,9 @@ "height": 730, "opacity": 1, "strokeDash": 0, - "strokeWidth": 2, + "strokeWidth": 0, "borderRadius": 0, - "fill": "#EDF0FD", + "fill": "#DEE1EB", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -250,9 +250,9 @@ "height": 80, "opacity": 1, "strokeDash": 0, - "strokeWidth": 2, + "strokeWidth": 0, "borderRadius": 0, - "fill": "#FFFFFF", + "fill": "#DEE1EB", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -289,9 +289,9 @@ "height": 466, "opacity": 1, "strokeDash": 0, - "strokeWidth": 2, + "strokeWidth": 0, "borderRadius": 0, - "fill": "#EDF0FD", + "fill": "#DEE1EB", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -368,9 +368,9 @@ "height": 216, "opacity": 1, "strokeDash": 0, - "strokeWidth": 2, + "strokeWidth": 0, "borderRadius": 0, - "fill": "#EDF0FD", + "fill": "#DEE1EB", "stroke": "#0D32B2", "shadow": false, "3d": false, diff --git a/e2etests/testdata/stable/sequence_diagram_groups/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_groups/elk/sketch.exp.svg index 47a70e507..68c5e9b9c 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_groups/elk/sketch.exp.svg @@ -14,10 +14,11 @@ width="1057" height="2268" viewBox="-100 -50 1057 2268">abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note +abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note diff --git a/e2etests/testdata/stable/sequence_diagram_nested_groups/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_nested_groups/dagre/board.exp.json new file mode 100644 index 000000000..8186c7b98 --- /dev/null +++ b/e2etests/testdata/stable/sequence_diagram_nested_groups/dagre/board.exp.json @@ -0,0 +1,1105 @@ +{ + "name": "", + "shapes": [ + { + "id": "this is a message group", + "type": "", + "pos": { + "x": -121, + "y": 266 + }, + "width": 562, + "height": 952, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "#DEE1EB", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": true, + "fields": null, + "methods": null, + "columns": null, + "label": "this is a message group", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 160, + "labelHeight": 26, + "zIndex": 3, + "level": 1 + }, + { + "id": "this is a message group.and this is a nested message group", + "type": "", + "pos": { + "x": -97, + "y": 396 + }, + "width": 514, + "height": 798, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "#DEE1EB", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": true, + "fields": null, + "methods": null, + "columns": null, + "label": "and this is a nested message group", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 238, + "labelHeight": 26, + "zIndex": 3, + "level": 2 + }, + { + "id": "this is a message group.and this is a nested message group.what about more nesting", + "type": "", + "pos": { + "x": -73, + "y": 526 + }, + "width": 466, + "height": 644, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "#DEE1EB", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": true, + "fields": null, + "methods": null, + "columns": null, + "label": "what about more nesting", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 173, + "labelHeight": 26, + "zIndex": 3, + "level": 3 + }, + { + "id": "this is a message group.and this is a nested message group.what about more nesting.crazy town", + "type": "", + "pos": { + "x": -49, + "y": 656 + }, + "width": 418, + "height": 490, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "#DEE1EB", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": true, + "fields": null, + "methods": null, + "columns": null, + "label": "crazy town", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 77, + "labelHeight": 26, + "zIndex": 3, + "level": 4 + }, + { + "id": "a", + "type": "", + "pos": { + "x": 0, + "y": 50 + }, + "width": 150, + "height": 126, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#EDF0FD", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 12, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "a.a note", + "type": "rectangle", + "pos": { + "x": 1, + "y": 696 + }, + "width": 148, + "height": 126, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#FFFFFF", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a note", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 48, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 5, + "level": 2 + }, + { + "id": "this is a message group.and this is a nested message group.what about more nesting.crazy town.whoa", + "type": "", + "pos": { + "x": 25, + "y": 1042 + }, + "width": 320, + "height": 80, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "#DEE1EB", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": true, + "fields": null, + "methods": null, + "columns": null, + "label": "whoa", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 41, + "labelHeight": 26, + "zIndex": 3, + "level": 5 + }, + { + "id": "alt", + "type": "", + "pos": { + "x": 221, + "y": 1148 + }, + "width": 388, + "height": 518, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "#DEE1EB", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": true, + "fields": null, + "methods": null, + "columns": null, + "label": "alt", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 24, + "labelHeight": 26, + "zIndex": 3, + "level": 1 + }, + { + "id": "alt.case 1", + "type": "", + "pos": { + "x": 245, + "y": 1172 + }, + "width": 340, + "height": 80, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "#DEE1EB", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": true, + "fields": null, + "methods": null, + "columns": null, + "label": "case 1", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 47, + "labelHeight": 26, + "zIndex": 3, + "level": 2 + }, + { + "id": "alt.case 2", + "type": "", + "pos": { + "x": 245, + "y": 1302 + }, + "width": 340, + "height": 80, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "#DEE1EB", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": true, + "fields": null, + "methods": null, + "columns": null, + "label": "case 2", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 47, + "labelHeight": 26, + "zIndex": 3, + "level": 2 + }, + { + "id": "alt.case 3", + "type": "", + "pos": { + "x": 245, + "y": 1432 + }, + "width": 340, + "height": 80, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "#DEE1EB", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": true, + "fields": null, + "methods": null, + "columns": null, + "label": "case 3", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 47, + "labelHeight": 26, + "zIndex": 3, + "level": 2 + }, + { + "id": "alt.case 4", + "type": "", + "pos": { + "x": 245, + "y": 1562 + }, + "width": 340, + "height": 80, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "#DEE1EB", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": true, + "fields": null, + "methods": null, + "columns": null, + "label": "case 4", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 47, + "labelHeight": 26, + "zIndex": 3, + "level": 2 + }, + { + "id": "b", + "type": "", + "pos": { + "x": 220, + "y": 50 + }, + "width": 150, + "height": 126, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#EDF0FD", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 13, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "b.note", + "type": "rectangle", + "pos": { + "x": 32, + "y": 2052 + }, + "width": 525, + "height": 126, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#FFFFFF", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a note here to remember that padding must consider notes too", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 425, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 5, + "level": 2 + }, + { + "id": "a.note", + "type": "rectangle", + "pos": { + "x": 6, + "y": 1732 + }, + "width": 137, + "height": 190, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#FFFFFF", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "just\na\nlong\nnote\nhere", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 37, + "labelHeight": 90, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 5, + "level": 2 + }, + { + "id": "c", + "type": "", + "pos": { + "x": 440, + "y": 50 + }, + "width": 190, + "height": 126, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#EDF0FD", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "just an actor", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 90, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [ + { + "id": "(a -> b)[0]", + "src": "a", + "srcArrow": "none", + "srcLabel": "", + "dst": "b", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 75, + "y": 306 + }, + { + "x": 295, + "y": 306 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "id": "(a -> b)[1]", + "src": "a", + "srcArrow": "none", + "srcLabel": "", + "dst": "b", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 75, + "y": 436 + }, + { + "x": 295, + "y": 436 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "id": "(a -> b)[2]", + "src": "a", + "srcArrow": "none", + "srcLabel": "", + "dst": "b", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 75, + "y": 566 + }, + { + "x": 295, + "y": 566 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "id": "(a -> b)[3]", + "src": "a", + "srcArrow": "none", + "srcLabel": "", + "dst": "b", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 75, + "y": 952 + }, + { + "x": 295, + "y": 952 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "id": "(a -> b)[4]", + "src": "a", + "srcArrow": "none", + "srcLabel": "", + "dst": "b", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 75, + "y": 1082 + }, + { + "x": 295, + "y": 1082 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "id": "(b -> c)[0]", + "src": "b", + "srcArrow": "none", + "srcLabel": "", + "dst": "c", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 295, + "y": 1212 + }, + { + "x": 535, + "y": 1212 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "id": "(b -> c)[1]", + "src": "b", + "srcArrow": "none", + "srcLabel": "", + "dst": "c", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 295, + "y": 1342 + }, + { + "x": 535, + "y": 1342 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "id": "(b -> c)[2]", + "src": "b", + "srcArrow": "none", + "srcLabel": "", + "dst": "c", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 295, + "y": 1472 + }, + { + "x": 535, + "y": 1472 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "id": "(b -> c)[3]", + "src": "b", + "srcArrow": "none", + "srcLabel": "", + "dst": "c", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 295, + "y": 1602 + }, + { + "x": 535, + "y": 1602 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "id": "(a -- )[0]", + "src": "a", + "srcArrow": "none", + "srcLabel": "", + "dst": "a-lifeline-end-2251863791", + "dstArrow": "none", + "dstLabel": "", + "opacity": 1, + "strokeDash": 6, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 75, + "y": 176 + }, + { + "x": 75, + "y": 2308 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 1 + }, + { + "id": "(b -- )[0]", + "src": "b", + "srcArrow": "none", + "srcLabel": "", + "dst": "b-lifeline-end-668380428", + "dstArrow": "none", + "dstLabel": "", + "opacity": 1, + "strokeDash": 6, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 295, + "y": 176 + }, + { + "x": 295, + "y": 2308 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 1 + }, + { + "id": "(c -- )[0]", + "src": "c", + "srcArrow": "none", + "srcLabel": "", + "dst": "c-lifeline-end-955173837", + "dstArrow": "none", + "dstLabel": "", + "opacity": 1, + "strokeDash": 6, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 535, + "y": 176 + }, + { + "x": 535, + "y": 2308 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 1 + } + ] +} diff --git a/e2etests/testdata/stable/sequence_diagram_nested_groups/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_nested_groups/dagre/sketch.exp.svg new file mode 100644 index 000000000..0a12d265e --- /dev/null +++ b/e2etests/testdata/stable/sequence_diagram_nested_groups/dagre/sketch.exp.svg @@ -0,0 +1,28 @@ + +abjust an actorthis is a message groupaltand this is a nested message groupcase 1case 2case 3case 4what about more nestingcrazy townwhoa a notea note here to remember that padding must consider notes toojustalongnotehere \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_nested_groups/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_nested_groups/elk/board.exp.json new file mode 100644 index 000000000..8186c7b98 --- /dev/null +++ b/e2etests/testdata/stable/sequence_diagram_nested_groups/elk/board.exp.json @@ -0,0 +1,1105 @@ +{ + "name": "", + "shapes": [ + { + "id": "this is a message group", + "type": "", + "pos": { + "x": -121, + "y": 266 + }, + "width": 562, + "height": 952, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "#DEE1EB", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": true, + "fields": null, + "methods": null, + "columns": null, + "label": "this is a message group", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 160, + "labelHeight": 26, + "zIndex": 3, + "level": 1 + }, + { + "id": "this is a message group.and this is a nested message group", + "type": "", + "pos": { + "x": -97, + "y": 396 + }, + "width": 514, + "height": 798, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "#DEE1EB", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": true, + "fields": null, + "methods": null, + "columns": null, + "label": "and this is a nested message group", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 238, + "labelHeight": 26, + "zIndex": 3, + "level": 2 + }, + { + "id": "this is a message group.and this is a nested message group.what about more nesting", + "type": "", + "pos": { + "x": -73, + "y": 526 + }, + "width": 466, + "height": 644, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "#DEE1EB", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": true, + "fields": null, + "methods": null, + "columns": null, + "label": "what about more nesting", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 173, + "labelHeight": 26, + "zIndex": 3, + "level": 3 + }, + { + "id": "this is a message group.and this is a nested message group.what about more nesting.crazy town", + "type": "", + "pos": { + "x": -49, + "y": 656 + }, + "width": 418, + "height": 490, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "#DEE1EB", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": true, + "fields": null, + "methods": null, + "columns": null, + "label": "crazy town", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 77, + "labelHeight": 26, + "zIndex": 3, + "level": 4 + }, + { + "id": "a", + "type": "", + "pos": { + "x": 0, + "y": 50 + }, + "width": 150, + "height": 126, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#EDF0FD", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 12, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "a.a note", + "type": "rectangle", + "pos": { + "x": 1, + "y": 696 + }, + "width": 148, + "height": 126, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#FFFFFF", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a note", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 48, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 5, + "level": 2 + }, + { + "id": "this is a message group.and this is a nested message group.what about more nesting.crazy town.whoa", + "type": "", + "pos": { + "x": 25, + "y": 1042 + }, + "width": 320, + "height": 80, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "#DEE1EB", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": true, + "fields": null, + "methods": null, + "columns": null, + "label": "whoa", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 41, + "labelHeight": 26, + "zIndex": 3, + "level": 5 + }, + { + "id": "alt", + "type": "", + "pos": { + "x": 221, + "y": 1148 + }, + "width": 388, + "height": 518, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "#DEE1EB", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": true, + "fields": null, + "methods": null, + "columns": null, + "label": "alt", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 24, + "labelHeight": 26, + "zIndex": 3, + "level": 1 + }, + { + "id": "alt.case 1", + "type": "", + "pos": { + "x": 245, + "y": 1172 + }, + "width": 340, + "height": 80, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "#DEE1EB", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": true, + "fields": null, + "methods": null, + "columns": null, + "label": "case 1", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 47, + "labelHeight": 26, + "zIndex": 3, + "level": 2 + }, + { + "id": "alt.case 2", + "type": "", + "pos": { + "x": 245, + "y": 1302 + }, + "width": 340, + "height": 80, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "#DEE1EB", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": true, + "fields": null, + "methods": null, + "columns": null, + "label": "case 2", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 47, + "labelHeight": 26, + "zIndex": 3, + "level": 2 + }, + { + "id": "alt.case 3", + "type": "", + "pos": { + "x": 245, + "y": 1432 + }, + "width": 340, + "height": 80, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "#DEE1EB", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": true, + "fields": null, + "methods": null, + "columns": null, + "label": "case 3", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 47, + "labelHeight": 26, + "zIndex": 3, + "level": 2 + }, + { + "id": "alt.case 4", + "type": "", + "pos": { + "x": 245, + "y": 1562 + }, + "width": 340, + "height": 80, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "#DEE1EB", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": true, + "fields": null, + "methods": null, + "columns": null, + "label": "case 4", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 47, + "labelHeight": 26, + "zIndex": 3, + "level": 2 + }, + { + "id": "b", + "type": "", + "pos": { + "x": 220, + "y": 50 + }, + "width": 150, + "height": 126, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#EDF0FD", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 13, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "b.note", + "type": "rectangle", + "pos": { + "x": 32, + "y": 2052 + }, + "width": 525, + "height": 126, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#FFFFFF", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a note here to remember that padding must consider notes too", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 425, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 5, + "level": 2 + }, + { + "id": "a.note", + "type": "rectangle", + "pos": { + "x": 6, + "y": 1732 + }, + "width": 137, + "height": 190, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#FFFFFF", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "just\na\nlong\nnote\nhere", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 37, + "labelHeight": 90, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 5, + "level": 2 + }, + { + "id": "c", + "type": "", + "pos": { + "x": 440, + "y": 50 + }, + "width": 190, + "height": 126, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#EDF0FD", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "just an actor", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 90, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [ + { + "id": "(a -> b)[0]", + "src": "a", + "srcArrow": "none", + "srcLabel": "", + "dst": "b", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 75, + "y": 306 + }, + { + "x": 295, + "y": 306 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "id": "(a -> b)[1]", + "src": "a", + "srcArrow": "none", + "srcLabel": "", + "dst": "b", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 75, + "y": 436 + }, + { + "x": 295, + "y": 436 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "id": "(a -> b)[2]", + "src": "a", + "srcArrow": "none", + "srcLabel": "", + "dst": "b", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 75, + "y": 566 + }, + { + "x": 295, + "y": 566 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "id": "(a -> b)[3]", + "src": "a", + "srcArrow": "none", + "srcLabel": "", + "dst": "b", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 75, + "y": 952 + }, + { + "x": 295, + "y": 952 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "id": "(a -> b)[4]", + "src": "a", + "srcArrow": "none", + "srcLabel": "", + "dst": "b", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 75, + "y": 1082 + }, + { + "x": 295, + "y": 1082 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "id": "(b -> c)[0]", + "src": "b", + "srcArrow": "none", + "srcLabel": "", + "dst": "c", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 295, + "y": 1212 + }, + { + "x": 535, + "y": 1212 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "id": "(b -> c)[1]", + "src": "b", + "srcArrow": "none", + "srcLabel": "", + "dst": "c", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 295, + "y": 1342 + }, + { + "x": 535, + "y": 1342 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "id": "(b -> c)[2]", + "src": "b", + "srcArrow": "none", + "srcLabel": "", + "dst": "c", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 295, + "y": 1472 + }, + { + "x": 535, + "y": 1472 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "id": "(b -> c)[3]", + "src": "b", + "srcArrow": "none", + "srcLabel": "", + "dst": "c", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 295, + "y": 1602 + }, + { + "x": 535, + "y": 1602 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "id": "(a -- )[0]", + "src": "a", + "srcArrow": "none", + "srcLabel": "", + "dst": "a-lifeline-end-2251863791", + "dstArrow": "none", + "dstLabel": "", + "opacity": 1, + "strokeDash": 6, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 75, + "y": 176 + }, + { + "x": 75, + "y": 2308 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 1 + }, + { + "id": "(b -- )[0]", + "src": "b", + "srcArrow": "none", + "srcLabel": "", + "dst": "b-lifeline-end-668380428", + "dstArrow": "none", + "dstLabel": "", + "opacity": 1, + "strokeDash": 6, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 295, + "y": 176 + }, + { + "x": 295, + "y": 2308 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 1 + }, + { + "id": "(c -- )[0]", + "src": "c", + "srcArrow": "none", + "srcLabel": "", + "dst": "c-lifeline-end-955173837", + "dstArrow": "none", + "dstLabel": "", + "opacity": 1, + "strokeDash": 6, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 535, + "y": 176 + }, + { + "x": 535, + "y": 2308 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 1 + } + ] +} diff --git a/e2etests/testdata/stable/sequence_diagram_nested_groups/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_nested_groups/elk/sketch.exp.svg new file mode 100644 index 000000000..0a12d265e --- /dev/null +++ b/e2etests/testdata/stable/sequence_diagram_nested_groups/elk/sketch.exp.svg @@ -0,0 +1,28 @@ + +abjust an actorthis is a message groupaltand this is a nested message groupcase 1case 2case 3case 4what about more nestingcrazy townwhoa a notea note here to remember that padding must consider notes toojustalongnotehere \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/sketch.exp.svg index f1ab7fd85..4803655fb 100644 --- a/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/sketch.exp.svg @@ -14,6 +14,7 @@ width="1593" height="1626" viewBox="-100 -50 1593 1626">How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutonly if root is not sequence 'How this is rendered: {...}'tokenized ASTcompile ASTobjects and edgesrun layout enginesrun engine on shape: sequence_diagram, temporarily removerun core engine on rest add back in sequence diagramsdiagram with correct positions and dimensionsexport diagram with chosen theme and rendererget theme stylesrender to SVGresulting SVGmeasurements also take place +How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutonly if root is not sequence 'How this is rendered: {...}'tokenized ASTcompile ASTobjects and edgesrun layout enginesrun engine on shape: sequence_diagram, temporarily removerun core engine on rest add back in sequence diagramsdiagram with correct positions and dimensionsexport diagram with chosen theme and rendererget theme stylesrender to SVGresulting SVGmeasurements also take place diff --git a/e2etests/testdata/stable/sequence_diagram_real/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_real/elk/board.exp.json index 494c31964..148259e77 100644 --- a/e2etests/testdata/stable/sequence_diagram_real/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_real/elk/board.exp.json @@ -372,9 +372,9 @@ "height": 80, "opacity": 1, "strokeDash": 0, - "strokeWidth": 2, + "strokeWidth": 0, "borderRadius": 0, - "fill": "#EDF0FD", + "fill": "#DEE1EB", "stroke": "#0D32B2", "shadow": false, "3d": false, diff --git a/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg index d96000897..4c804cb4f 100644 --- a/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg @@ -14,10 +14,11 @@ width="2374" height="2488" viewBox="-88 -88 2374 2488">How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutonly if root is not sequence 'How this is rendered: {...}'tokenized ASTcompile ASTobjects and edgesrun layout enginesrun engine on shape: sequence_diagram, temporarily removerun core engine on rest add back in sequence diagramsdiagram with correct positions and dimensionsexport diagram with chosen theme and rendererget theme stylesrender to SVGresulting SVGmeasurements also take place +How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutonly if root is not sequence 'How this is rendered: {...}'tokenized ASTcompile ASTobjects and edgesrun layout enginesrun engine on shape: sequence_diagram, temporarily removerun core engine on rest add back in sequence diagramsdiagram with correct positions and dimensionsexport diagram with chosen theme and rendererget theme stylesrender to SVGresulting SVGmeasurements also take place diff --git a/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/sketch.exp.svg index 8e5a98c71..1847369d9 100644 --- a/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/sketch.exp.svg @@ -14,6 +14,7 @@ width="666" height="1366" viewBox="-100 -50 666 1366">a_shapea_sequenceanotherfinallysequencesequencesequencescoreritemResponseitemessayRubricconceptitemOutcomescorerconceptessayRubricitemitemOutcomeitemResponsescoreritemResponseitemessayRubricconceptitemOutcome getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts)getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) +a_shapea_sequenceanotherfinallysequencesequencesequencescoreritemResponseitemessayRubricconceptitemOutcomescorerconceptessayRubricitemitemOutcomeitemResponsescoreritemResponseitemessayRubricconceptitemOutcome getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts)getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) diff --git a/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json index 005c6a567..ba95b1738 100644 --- a/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json @@ -174,7 +174,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F0F3F9", + "fill": "#DEE1EB", "stroke": "#0D32B2", "shadow": false, "3d": false, diff --git a/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg index 3228476ef..f9bc2aef5 100644 --- a/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg @@ -14,10 +14,11 @@ width="3166" height="4293" viewBox="-88 -88 3166 4293">a_shapea_sequenceanotherfinallysequencesequencesequencescoreritemResponseitemessayRubricconceptitemOutcomescorerconceptessayRubricitemitemOutcomeitemResponsescoreritemResponseitemessayRubricconceptitemOutcome getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts)getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) +a_shapea_sequenceanotherfinallysequencesequencesequencescoreritemResponseitemessayRubricconceptitemOutcomescorerconceptessayRubricitemitemOutcomeitemResponsescoreritemResponseitemessayRubricconceptitemOutcome getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts)getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) diff --git a/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg b/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg index 421a07a1a..cf84dfc73 100644 --- a/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg @@ -14,6 +14,7 @@ width="1162" height="660" viewBox="-100 -100 1162 660">