From edb6b857b35426baeac64a7e0bd0cac3b6ca4a31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BAlio=20C=C3=A9sar=20Batista?= Date: Mon, 5 Dec 2022 10:19:26 -0800 Subject: [PATCH 1/9] Space actor centers --- d2layouts/d2sequence/sequence_diagram.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/d2layouts/d2sequence/sequence_diagram.go b/d2layouts/d2sequence/sequence_diagram.go index 3df170756..752299adc 100644 --- a/d2layouts/d2sequence/sequence_diagram.go +++ b/d2layouts/d2sequence/sequence_diagram.go @@ -196,7 +196,6 @@ func newSequenceDiagram(objects []*d2graph.Object, messages []*d2graph.Edge) *se // rankDiff = 0 for self edges distributedLabelWidth := float64(message.LabelDimensions.Width) / rankDiff sd.actorXStep = math.Max(sd.actorXStep, distributedLabelWidth+HORIZONTAL_PAD) - } sd.lastMessage[message.Src] = message if _, exists := sd.firstMessage[message.Src]; !exists { @@ -287,9 +286,9 @@ func (sd *sequenceDiagram) placeGroup(group *d2graph.Object) { ) } -// placeActors places actors bottom aligned, side by side +// placeActors places actors bottom aligned, side by side with centers spaced by sd.actorXStep func (sd *sequenceDiagram) placeActors() { - x := 0. + centerX := sd.actors[0].Width / 2. for _, actor := range sd.actors { shape := actor.Attributes.Shape.Value var yOffset float64 @@ -303,8 +302,9 @@ func (sd *sequenceDiagram) placeActors() { actor.LabelPosition = go2.Pointer(string(label.InsideMiddleCenter)) yOffset = sd.maxActorHeight - actor.Height } - actor.TopLeft = geo.NewPoint(x, yOffset) - x += actor.Width + sd.actorXStep + halfWidth := actor.Width / 2. + actor.TopLeft = geo.NewPoint(math.Round(centerX-halfWidth), yOffset) + centerX += sd.actorXStep } } From 04ba174fe56e0933e1add3498a4cf1b7b3258980 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BAlio=20C=C3=A9sar=20Batista?= Date: Mon, 5 Dec 2022 10:27:55 -0800 Subject: [PATCH 2/9] Handle different actor distances --- d2layouts/d2sequence/sequence_diagram.go | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/d2layouts/d2sequence/sequence_diagram.go b/d2layouts/d2sequence/sequence_diagram.go index 752299adc..11df81b59 100644 --- a/d2layouts/d2sequence/sequence_diagram.go +++ b/d2layouts/d2sequence/sequence_diagram.go @@ -32,8 +32,11 @@ type sequenceDiagram struct { firstMessage map[*d2graph.Object]*d2graph.Edge lastMessage map[*d2graph.Object]*d2graph.Edge + // the distance from actor[i] center to actor[i+1] center + // every neighbor actors need different distances depending on the message labels between them + actorXStep []float64 + yStep float64 - actorXStep float64 maxActorHeight float64 verticalIndices map[string]int @@ -139,8 +142,8 @@ func newSequenceDiagram(objects []*d2graph.Object, messages []*d2graph.Edge) *se objectRank: make(map[*d2graph.Object]int), firstMessage: make(map[*d2graph.Object]*d2graph.Edge), lastMessage: make(map[*d2graph.Object]*d2graph.Edge), + actorXStep: make([]float64, len(actors)-1), yStep: MIN_MESSAGE_DISTANCE, - actorXStep: MIN_ACTOR_DISTANCE, maxActorHeight: 0., verticalIndices: make(map[string]int), } @@ -183,6 +186,10 @@ func newSequenceDiagram(objects []*d2graph.Object, messages []*d2graph.Edge) *se queue = append(queue, child.ChildrenArray...) } + + if rank != len(actors)-1 { + sd.actorXStep[rank] = math.Max(actor.Width/2., MIN_ACTOR_DISTANCE) + } } for _, message := range sd.messages { @@ -195,7 +202,9 @@ func newSequenceDiagram(objects []*d2graph.Object, messages []*d2graph.Edge) *se if rankDiff != 0 { // rankDiff = 0 for self edges distributedLabelWidth := float64(message.LabelDimensions.Width) / rankDiff - sd.actorXStep = math.Max(sd.actorXStep, distributedLabelWidth+HORIZONTAL_PAD) + for rank := sd.objectRank[message.Src]; rank <= sd.objectRank[message.Dst]-1; rank++ { + sd.actorXStep[rank] = math.Max(sd.actorXStep[rank], distributedLabelWidth+HORIZONTAL_PAD) + } } sd.lastMessage[message.Src] = message if _, exists := sd.firstMessage[message.Src]; !exists { @@ -289,7 +298,7 @@ func (sd *sequenceDiagram) placeGroup(group *d2graph.Object) { // placeActors places actors bottom aligned, side by side with centers spaced by sd.actorXStep func (sd *sequenceDiagram) placeActors() { centerX := sd.actors[0].Width / 2. - for _, actor := range sd.actors { + for rank, actor := range sd.actors { shape := actor.Attributes.Shape.Value var yOffset float64 if shape == d2target.ShapeImage || shape == d2target.ShapePerson { @@ -304,7 +313,9 @@ func (sd *sequenceDiagram) placeActors() { } halfWidth := actor.Width / 2. actor.TopLeft = geo.NewPoint(math.Round(centerX-halfWidth), yOffset) - centerX += sd.actorXStep + if rank != len(sd.actors)-1 { + centerX += sd.actorXStep[rank] + } } } From 3eca7bd13923395ba8bd4f691e40286b9ccdb1aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BAlio=20C=C3=A9sar=20Batista?= Date: Mon, 5 Dec 2022 10:33:46 -0800 Subject: [PATCH 3/9] Update tests --- d2layouts/d2sequence/layout_test.go | 8 +- e2etests/stable_test.go | 12 + .../dagre/board.exp.json | 553 ++++++++++++++++++ .../dagre/sketch.exp.svg | 39 ++ .../elk/board.exp.json | 553 ++++++++++++++++++ .../elk/sketch.exp.svg | 39 ++ .../dagre/board.exp.json | 188 +++--- .../dagre/sketch.exp.svg | 28 +- .../elk/board.exp.json | 188 +++--- .../elk/sketch.exp.svg | 28 +- .../dagre/board.exp.json | 80 +-- .../dagre/sketch.exp.svg | 14 +- .../elk/board.exp.json | 80 +-- .../elk/sketch.exp.svg | 14 +- .../dagre/board.exp.json | 90 +-- .../dagre/sketch.exp.svg | 4 +- .../elk/board.exp.json | 90 +-- .../elk/sketch.exp.svg | 4 +- .../dagre/board.exp.json | 32 +- .../dagre/sketch.exp.svg | 8 +- .../sequence_diagram_note/elk/board.exp.json | 32 +- .../sequence_diagram_note/elk/sketch.exp.svg | 8 +- .../dagre/board.exp.json | 92 +-- .../dagre/sketch.exp.svg | 32 +- .../sequence_diagram_real/elk/board.exp.json | 92 +-- .../sequence_diagram_real/elk/sketch.exp.svg | 32 +- .../dagre/board.exp.json | 42 +- .../dagre/sketch.exp.svg | 16 +- .../elk/board.exp.json | 42 +- .../elk/sketch.exp.svg | 16 +- .../dagre/board.exp.json | 56 +- .../dagre/sketch.exp.svg | 22 +- .../elk/board.exp.json | 56 +- .../elk/sketch.exp.svg | 22 +- .../dagre/board.exp.json | 80 +-- .../dagre/sketch.exp.svg | 30 +- .../sequence_diagram_span/elk/board.exp.json | 80 +-- .../sequence_diagram_span/elk/sketch.exp.svg | 30 +- .../sequence_diagrams/dagre/board.exp.json | 390 ++++++------ .../sequence_diagrams/dagre/sketch.exp.svg | 54 +- .../sequence_diagrams/elk/board.exp.json | 346 +++++------ .../sequence_diagrams/elk/sketch.exp.svg | 54 +- 42 files changed, 2436 insertions(+), 1240 deletions(-) create mode 100644 e2etests/testdata/stable/sequence_diagram_actor_distance/dagre/board.exp.json create mode 100644 e2etests/testdata/stable/sequence_diagram_actor_distance/dagre/sketch.exp.svg create mode 100644 e2etests/testdata/stable/sequence_diagram_actor_distance/elk/board.exp.json create mode 100644 e2etests/testdata/stable/sequence_diagram_actor_distance/elk/sketch.exp.svg diff --git a/d2layouts/d2sequence/layout_test.go b/d2layouts/d2sequence/layout_test.go index 5f2368c9b..dc4e6d07c 100644 --- a/d2layouts/d2sequence/layout_test.go +++ b/d2layouts/d2sequence/layout_test.go @@ -393,7 +393,7 @@ func TestSelfEdges(t *testing.T) { } ctx := log.WithTB(context.Background(), t, nil) - Layout(ctx, g, func(ctx context.Context, g *d2graph.Graph) error { + d2sequence.Layout(ctx, g, func(ctx context.Context, g *d2graph.Graph) error { return nil }) @@ -406,8 +406,8 @@ func TestSelfEdges(t *testing.T) { t.Fatalf("route does not end at the same actor, start at %.5f, end at %.5f", route[0].X, route[3].X) } - if route[3].Y-route[0].Y != MIN_MESSAGE_DISTANCE { - t.Fatalf("expected route height to be %.f5, got %.5f", MIN_MESSAGE_DISTANCE, route[3].Y-route[0].Y) + if route[3].Y-route[0].Y != d2sequence.MIN_MESSAGE_DISTANCE { + t.Fatalf("expected route height to be %.f5, got %.5f", d2sequence.MIN_MESSAGE_DISTANCE, route[3].Y-route[0].Y) } } @@ -435,7 +435,7 @@ func TestSequenceToDescendant(t *testing.T) { } ctx := log.WithTB(context.Background(), t, nil) - Layout(ctx, g, func(ctx context.Context, g *d2graph.Graph) error { + d2sequence.Layout(ctx, g, func(ctx context.Context, g *d2graph.Graph) error { return nil }) diff --git a/e2etests/stable_test.go b/e2etests/stable_test.go index d256a29ed..526d22aca 100644 --- a/e2etests/stable_test.go +++ b/e2etests/stable_test.go @@ -1408,6 +1408,18 @@ choo: { d2exporter.export -> CLI: resulting SVG } `, + }, { + name: "sequence_diagram_actor_distance", + script: `shape: sequence_diagram +a: "an actor with a really long label that will break everything" +b: "a short one" +c: "an\nactor\nwith\na\nreally\nlong\nlabel\nthat\nwill\nbreak\neverything" +d: "simple" +a -> b -> c: "short" +a -> b: "long label for testing purposes and it must be really, really long" +b -> c: "long label for testing purposes and it must be really, really long" +c -> d: "short" +a -> d: "this should span many actors lifelines so we know how it will look like when redering a long label over many actors"`, }, } diff --git a/e2etests/testdata/stable/sequence_diagram_actor_distance/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_actor_distance/dagre/board.exp.json new file mode 100644 index 000000000..6a65d1acc --- /dev/null +++ b/e2etests/testdata/stable/sequence_diagram_actor_distance/dagre/board.exp.json @@ -0,0 +1,553 @@ +{ + "name": "", + "shapes": [ + { + "id": "a", + "type": "", + "pos": { + "x": 0, + "y": 210 + }, + "width": 514, + "height": 126, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "an actor with a really long label that will break everything", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 414, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "b", + "type": "", + "pos": { + "x": 626, + "y": 210 + }, + "width": 184, + "height": 126, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "a short one", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 84, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "c", + "type": "", + "pos": { + "x": 1088, + "y": 50 + }, + "width": 183, + "height": 286, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "an\nactor\nwith\na\nreally\nlong\nlabel\nthat\nwill\nbreak\neverything", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 83, + "labelHeight": 186, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "d", + "type": "", + "pos": { + "x": 1401, + "y": 210 + }, + "width": 152, + "height": 126, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "simple", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 52, + "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": "short", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 36, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 257, + "y": 466 + }, + { + "x": 718, + "y": 466 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 2 + }, + { + "id": "(b -> c)[0]", + "src": "b", + "srcArrow": "none", + "srcLabel": "", + "dst": "c", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "short", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 36, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 718, + "y": 596 + }, + { + "x": 1179.5, + "y": 596 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 2 + }, + { + "id": "(a -> b)[1]", + "src": "a", + "srcArrow": "none", + "srcLabel": "", + "dst": "b", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "long label for testing purposes and it must be really, really long", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 411, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 257, + "y": 726 + }, + { + "x": 718, + "y": 726 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 2 + }, + { + "id": "(b -> c)[1]", + "src": "b", + "srcArrow": "none", + "srcLabel": "", + "dst": "c", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "long label for testing purposes and it must be really, really long", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 411, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 718, + "y": 856 + }, + { + "x": 1179.5, + "y": 856 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 2 + }, + { + "id": "(c -> d)[0]", + "src": "c", + "srcArrow": "none", + "srcLabel": "", + "dst": "d", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "short", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 36, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 1179.5, + "y": 986 + }, + { + "x": 1477, + "y": 986 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 2 + }, + { + "id": "(a -> d)[0]", + "src": "a", + "srcArrow": "none", + "srcLabel": "", + "dst": "d", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "this should span many actors lifelines so we know how it will look like when redering a long label over many actors", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 745, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 257, + "y": 1116 + }, + { + "x": 1477, + "y": 1116 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 2 + }, + { + "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": 257, + "y": 336 + }, + { + "x": 257, + "y": 1246 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "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": 718, + "y": 336 + }, + { + "x": 718, + "y": 1246 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "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": 1179.5, + "y": 336 + }, + { + "x": 1179.5, + "y": 1246 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(d -- )[0]", + "src": "d", + "srcArrow": "none", + "srcLabel": "", + "dst": "d-lifeline-end-2106864010", + "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": 1477, + "y": 336 + }, + { + "x": 1477, + "y": 1246 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ] +} diff --git a/e2etests/testdata/stable/sequence_diagram_actor_distance/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_actor_distance/dagre/sketch.exp.svg new file mode 100644 index 000000000..ab5408c09 --- /dev/null +++ b/e2etests/testdata/stable/sequence_diagram_actor_distance/dagre/sketch.exp.svg @@ -0,0 +1,39 @@ + +an actor with a really long label that will break everythinga short oneanactorwithareallylonglabelthatwillbreakeverythingsimple shortshortlong label for testing purposes and it must be really, really longlong label for testing purposes and it must be really, really longshortthis should span many actors lifelines so we know how it will look like when redering a long label over many actors + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_actor_distance/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_actor_distance/elk/board.exp.json new file mode 100644 index 000000000..6a65d1acc --- /dev/null +++ b/e2etests/testdata/stable/sequence_diagram_actor_distance/elk/board.exp.json @@ -0,0 +1,553 @@ +{ + "name": "", + "shapes": [ + { + "id": "a", + "type": "", + "pos": { + "x": 0, + "y": 210 + }, + "width": 514, + "height": 126, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "an actor with a really long label that will break everything", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 414, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "b", + "type": "", + "pos": { + "x": 626, + "y": 210 + }, + "width": 184, + "height": 126, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "a short one", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 84, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "c", + "type": "", + "pos": { + "x": 1088, + "y": 50 + }, + "width": 183, + "height": 286, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "an\nactor\nwith\na\nreally\nlong\nlabel\nthat\nwill\nbreak\neverything", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 83, + "labelHeight": 186, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "d", + "type": "", + "pos": { + "x": 1401, + "y": 210 + }, + "width": 152, + "height": 126, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "simple", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 52, + "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": "short", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 36, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 257, + "y": 466 + }, + { + "x": 718, + "y": 466 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 2 + }, + { + "id": "(b -> c)[0]", + "src": "b", + "srcArrow": "none", + "srcLabel": "", + "dst": "c", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "short", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 36, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 718, + "y": 596 + }, + { + "x": 1179.5, + "y": 596 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 2 + }, + { + "id": "(a -> b)[1]", + "src": "a", + "srcArrow": "none", + "srcLabel": "", + "dst": "b", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "long label for testing purposes and it must be really, really long", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 411, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 257, + "y": 726 + }, + { + "x": 718, + "y": 726 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 2 + }, + { + "id": "(b -> c)[1]", + "src": "b", + "srcArrow": "none", + "srcLabel": "", + "dst": "c", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "long label for testing purposes and it must be really, really long", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 411, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 718, + "y": 856 + }, + { + "x": 1179.5, + "y": 856 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 2 + }, + { + "id": "(c -> d)[0]", + "src": "c", + "srcArrow": "none", + "srcLabel": "", + "dst": "d", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "short", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 36, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 1179.5, + "y": 986 + }, + { + "x": 1477, + "y": 986 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 2 + }, + { + "id": "(a -> d)[0]", + "src": "a", + "srcArrow": "none", + "srcLabel": "", + "dst": "d", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "this should span many actors lifelines so we know how it will look like when redering a long label over many actors", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 745, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 257, + "y": 1116 + }, + { + "x": 1477, + "y": 1116 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 2 + }, + { + "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": 257, + "y": 336 + }, + { + "x": 257, + "y": 1246 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "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": 718, + "y": 336 + }, + { + "x": 718, + "y": 1246 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "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": 1179.5, + "y": 336 + }, + { + "x": 1179.5, + "y": 1246 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(d -- )[0]", + "src": "d", + "srcArrow": "none", + "srcLabel": "", + "dst": "d-lifeline-end-2106864010", + "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": 1477, + "y": 336 + }, + { + "x": 1477, + "y": 1246 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ] +} diff --git a/e2etests/testdata/stable/sequence_diagram_actor_distance/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_actor_distance/elk/sketch.exp.svg new file mode 100644 index 000000000..ab5408c09 --- /dev/null +++ b/e2etests/testdata/stable/sequence_diagram_actor_distance/elk/sketch.exp.svg @@ -0,0 +1,39 @@ + +an actor with a really long label that will break everythinga short oneanactorwithareallylonglabelthatwillbreakeverythingsimple shortshortlong label for testing purposes and it must be really, really longlong label for testing purposes and it must be really, really longshortthis should span many actors lifelines so we know how it will look like when redering a long label over many actors + + + + + + + + \ No newline at end of file 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 49097965c..4c42ba6d9 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 @@ -44,7 +44,7 @@ "id": "b", "type": "oval", "pos": { - "x": 410, + "x": 259, "y": 84 }, "width": 150, @@ -83,7 +83,7 @@ "id": "c", "type": "class", "pos": { - "x": 817, + "x": 463, "y": 50 }, "width": 241, @@ -133,7 +133,7 @@ "id": "d", "type": "cloud", "pos": { - "x": 1315, + "x": 744, "y": 108 }, "width": 179, @@ -172,7 +172,7 @@ "id": "e", "type": "code", "pos": { - "x": 1751, + "x": 986, "y": 164 }, "width": 196, @@ -211,7 +211,7 @@ "id": "f", "type": "cylinder", "pos": { - "x": 2204, + "x": 1259, "y": 84 }, "width": 150, @@ -250,7 +250,7 @@ "id": "g", "type": "diamond", "pos": { - "x": 2611, + "x": 1509, "y": 85 }, "width": 150, @@ -289,7 +289,7 @@ "id": "h", "type": "document", "pos": { - "x": 3018, + "x": 1759, "y": 97 }, "width": 150, @@ -328,7 +328,7 @@ "id": "i", "type": "hexagon", "pos": { - "x": 3425, + "x": 1993, "y": 108 }, "width": 182, @@ -367,7 +367,7 @@ "id": "j", "type": "image", "pos": { - "x": 3864, + "x": 2259, "y": 63 }, "width": 150, @@ -417,7 +417,7 @@ "id": "k", "type": "oval", "pos": { - "x": 4271, + "x": 2509, "y": 97 }, "width": 150, @@ -456,7 +456,7 @@ "id": "l", "type": "package", "pos": { - "x": 4678, + "x": 2759, "y": 98 }, "width": 150, @@ -495,7 +495,7 @@ "id": "m", "type": "page", "pos": { - "x": 5085, + "x": 2996, "y": 108 }, "width": 175, @@ -534,7 +534,7 @@ "id": "n", "type": "parallelogram", "pos": { - "x": 5517, + "x": 3242, "y": 92 }, "width": 183, @@ -573,7 +573,7 @@ "id": "o", "type": "person", "pos": { - "x": 5957, + "x": 3507, "y": 55 }, "width": 154, @@ -612,7 +612,7 @@ "id": "p", "type": "queue", "pos": { - "x": 6368, + "x": 3753, "y": 108 }, "width": 161, @@ -651,7 +651,7 @@ "id": "q", "type": "rectangle", "pos": { - "x": 6786, + "x": 4001, "y": 69 }, "width": 165, @@ -690,7 +690,7 @@ "id": "r", "type": "step", "pos": { - "x": 7208, + "x": 4227, "y": 108 }, "width": 213, @@ -729,7 +729,7 @@ "id": "s", "type": "stored_data", "pos": { - "x": 7678, + "x": 4509, "y": 96 }, "width": 150, @@ -768,7 +768,7 @@ "id": "t", "type": "sql_table", "pos": { - "x": 8085, + "x": 4729, "y": 126 }, "width": 210, @@ -848,7 +848,7 @@ "y": 364 }, { - "x": 485, + "x": 334, "y": 364 } ], @@ -883,11 +883,11 @@ "labelPercentage": 0, "route": [ { - "x": 485, + "x": 334, "y": 494 }, { - "x": 937.5, + "x": 583.5, "y": 494 } ], @@ -922,11 +922,11 @@ "labelPercentage": 0, "route": [ { - "x": 937.5, + "x": 583.5, "y": 624 }, { - "x": 1404.5, + "x": 833.5, "y": 624 } ], @@ -961,11 +961,11 @@ "labelPercentage": 0, "route": [ { - "x": 1404.5, + "x": 833.5, "y": 754 }, { - "x": 1849, + "x": 1084, "y": 754 } ], @@ -1000,11 +1000,11 @@ "labelPercentage": 0, "route": [ { - "x": 1849, + "x": 1084, "y": 884 }, { - "x": 2279, + "x": 1334, "y": 884 } ], @@ -1039,11 +1039,11 @@ "labelPercentage": 0, "route": [ { - "x": 2279, + "x": 1334, "y": 1014 }, { - "x": 2686, + "x": 1584, "y": 1014 } ], @@ -1078,11 +1078,11 @@ "labelPercentage": 0, "route": [ { - "x": 2686, + "x": 1584, "y": 1144 }, { - "x": 3093, + "x": 1834, "y": 1144 } ], @@ -1117,11 +1117,11 @@ "labelPercentage": 0, "route": [ { - "x": 3093, + "x": 1834, "y": 1274 }, { - "x": 3516, + "x": 2084, "y": 1274 } ], @@ -1156,11 +1156,11 @@ "labelPercentage": 0, "route": [ { - "x": 3516, + "x": 2084, "y": 1404 }, { - "x": 3939, + "x": 2334, "y": 1404 } ], @@ -1195,11 +1195,11 @@ "labelPercentage": 0, "route": [ { - "x": 3939, + "x": 2334, "y": 1534 }, { - "x": 4346, + "x": 2584, "y": 1534 } ], @@ -1234,11 +1234,11 @@ "labelPercentage": 0, "route": [ { - "x": 4346, + "x": 2584, "y": 1664 }, { - "x": 4753, + "x": 2834, "y": 1664 } ], @@ -1273,11 +1273,11 @@ "labelPercentage": 0, "route": [ { - "x": 4753, + "x": 2834, "y": 1794 }, { - "x": 5172.5, + "x": 3083.5, "y": 1794 } ], @@ -1312,11 +1312,11 @@ "labelPercentage": 0, "route": [ { - "x": 5172.5, + "x": 3083.5, "y": 1924 }, { - "x": 5608.5, + "x": 3333.5, "y": 1924 } ], @@ -1351,11 +1351,11 @@ "labelPercentage": 0, "route": [ { - "x": 5608.5, + "x": 3333.5, "y": 2054 }, { - "x": 6034, + "x": 3584, "y": 2054 } ], @@ -1390,11 +1390,11 @@ "labelPercentage": 0, "route": [ { - "x": 6034, + "x": 3584, "y": 2184 }, { - "x": 6448.5, + "x": 3833.5, "y": 2184 } ], @@ -1429,11 +1429,11 @@ "labelPercentage": 0, "route": [ { - "x": 6448.5, + "x": 3833.5, "y": 2314 }, { - "x": 6868.5, + "x": 4083.5, "y": 2314 } ], @@ -1468,11 +1468,11 @@ "labelPercentage": 0, "route": [ { - "x": 6868.5, + "x": 4083.5, "y": 2444 }, { - "x": 7314.5, + "x": 4333.5, "y": 2444 } ], @@ -1507,11 +1507,11 @@ "labelPercentage": 0, "route": [ { - "x": 7314.5, + "x": 4333.5, "y": 2574 }, { - "x": 7753, + "x": 4584, "y": 2574 } ], @@ -1546,11 +1546,11 @@ "labelPercentage": 0, "route": [ { - "x": 7753, + "x": 4584, "y": 2704 }, { - "x": 8190, + "x": 4834, "y": 2704 } ], @@ -1624,11 +1624,11 @@ "labelPercentage": 0, "route": [ { - "x": 485, + "x": 334, "y": 234 }, { - "x": 485, + "x": 334, "y": 2834 } ], @@ -1663,11 +1663,11 @@ "labelPercentage": 0, "route": [ { - "x": 937.5, + "x": 583.5, "y": 234 }, { - "x": 937.5, + "x": 583.5, "y": 2834 } ], @@ -1702,11 +1702,11 @@ "labelPercentage": 0, "route": [ { - "x": 1404.5, + "x": 833.5, "y": 234 }, { - "x": 1404.5, + "x": 833.5, "y": 2834 } ], @@ -1741,11 +1741,11 @@ "labelPercentage": 0, "route": [ { - "x": 1849, + "x": 1084, "y": 234 }, { - "x": 1849, + "x": 1084, "y": 2834 } ], @@ -1780,11 +1780,11 @@ "labelPercentage": 0, "route": [ { - "x": 2279, + "x": 1334, "y": 234 }, { - "x": 2279, + "x": 1334, "y": 2834 } ], @@ -1819,11 +1819,11 @@ "labelPercentage": 0, "route": [ { - "x": 2686, + "x": 1584, "y": 234 }, { - "x": 2686, + "x": 1584, "y": 2834 } ], @@ -1858,11 +1858,11 @@ "labelPercentage": 0, "route": [ { - "x": 3093, + "x": 1834, "y": 234 }, { - "x": 3093, + "x": 1834, "y": 2834 } ], @@ -1897,11 +1897,11 @@ "labelPercentage": 0, "route": [ { - "x": 3516, + "x": 2084, "y": 234 }, { - "x": 3516, + "x": 2084, "y": 2834 } ], @@ -1936,11 +1936,11 @@ "labelPercentage": 0, "route": [ { - "x": 3939, + "x": 2334, "y": 239 }, { - "x": 3939, + "x": 2334, "y": 2834 } ], @@ -1975,11 +1975,11 @@ "labelPercentage": 0, "route": [ { - "x": 4346, + "x": 2584, "y": 234 }, { - "x": 4346, + "x": 2584, "y": 2834 } ], @@ -2014,11 +2014,11 @@ "labelPercentage": 0, "route": [ { - "x": 4753, + "x": 2834, "y": 234 }, { - "x": 4753, + "x": 2834, "y": 2834 } ], @@ -2053,11 +2053,11 @@ "labelPercentage": 0, "route": [ { - "x": 5172.5, + "x": 3083.5, "y": 234 }, { - "x": 5172.5, + "x": 3083.5, "y": 2834 } ], @@ -2092,11 +2092,11 @@ "labelPercentage": 0, "route": [ { - "x": 5608.5, + "x": 3333.5, "y": 234 }, { - "x": 5608.5, + "x": 3333.5, "y": 2834 } ], @@ -2131,11 +2131,11 @@ "labelPercentage": 0, "route": [ { - "x": 6034, + "x": 3584, "y": 239 }, { - "x": 6034, + "x": 3584, "y": 2834 } ], @@ -2170,11 +2170,11 @@ "labelPercentage": 0, "route": [ { - "x": 6448.5, + "x": 3833.5, "y": 234 }, { - "x": 6448.5, + "x": 3833.5, "y": 2834 } ], @@ -2209,11 +2209,11 @@ "labelPercentage": 0, "route": [ { - "x": 6868.5, + "x": 4083.5, "y": 234 }, { - "x": 6868.5, + "x": 4083.5, "y": 2834 } ], @@ -2248,11 +2248,11 @@ "labelPercentage": 0, "route": [ { - "x": 7314.5, + "x": 4333.5, "y": 234 }, { - "x": 7314.5, + "x": 4333.5, "y": 2834 } ], @@ -2287,11 +2287,11 @@ "labelPercentage": 0, "route": [ { - "x": 7753, + "x": 4584, "y": 234 }, { - "x": 7753, + "x": 4584, "y": 2834 } ], @@ -2326,11 +2326,11 @@ "labelPercentage": 0, "route": [ { - "x": 8190, + "x": 4834, "y": 234 }, { - "x": 8190, + "x": 4834, "y": 2834 } ], 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 0428bcef4..2d74a90f0 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 @@ -2,7 +2,7 @@ a labelblabelsa class+ +public() bool +void- +private() int +voidcloudyyyya := 5 b := a + 7 -fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersid -int -name -varchar - result := callThisFunction(obj, 5) midthis sideother side - - - +fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersid +int +name +varchar + result := callThisFunction(obj, 5) midthis sideother side + + + a labelblabelsa class+ -public() bool -void- -private() int -voidcloudyyyya := 5 +a labelblabelsa class+ +public() bool +void- +private() int +voidcloudyyyya := 5 b := a + 7 -fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersid -int -name -varchar - result := callThisFunction(obj, 5) midthis sideother side - - - +fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersid +int +name +varchar + result := callThisFunction(obj, 5) midthis sideother side + + + abcdggggroup 1group bchoonested guywhat would arnold saythis note lalaeyokayokay - - - - - +abcdggggroup 1group bchoonested guywhat would arnold saythis note lalaeyokayokay + + + + + abcdggggroup 1group bchoonested guywhat would arnold saythis note lalaeyokayokay - - - - - +abcdggggroup 1group bchoonested guywhat would arnold saythis note lalaeyokayokay + + + + + scoreritemResponseitemessayRubricconceptitemOutcome scoreritemResponseitemessayRubricconceptitemOutcome abcdexplanationanother 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 okay - - +abcdexplanationanother 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 okay + + abcdexplanationanother 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 okay - - +abcdexplanationanother 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 okay + + How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutmeasurements also take place '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 SVG - - - - - - - - - - - - - - +How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutmeasurements also take place '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 SVG + + + + + + + + + + + + + + How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutmeasurements also take place '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 SVG - - - - - - - - - - - - - - +How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutmeasurements also take place '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 SVG + + + + + + + + + + + + + + ab a self edge herebetween actorsto descendantto deeper descendantto parentactor - +ab a self edge herebetween actorsto descendantto deeper descendantto parentactor + - - - - - + + + + + ab a self edge herebetween actorsto descendantto deeper descendantto parentactor - +ab a self edge herebetween actorsto descendantto deeper descendantto parentactor + - - - - - + + + + + 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 - - - - - - - - - +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 + + + + + + + + + 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 - - - - - - - - - +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 + + + + + + + + + scoreritemResponseitemessayRubricconceptitemOutcome getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) - - - - - - - - - - - - - +scoreritemResponseitemessayRubricconceptitemOutcome getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) + + + + + + + + + + + + + scoreritemResponseitemessayRubricconceptitemOutcome getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) - - - - - - - - - - - - - +scoreritemResponseitemessayRubricconceptitemOutcome 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) - - - - - - - - - - - - - - - - - - - - - - - - - +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) - - - - - - - - - - - - - - - - - - - - - - - - - +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) + + + + + + + + + + + + + + + + + + + + + + + + + an actor with a really long label that will break everythinga short oneanactorwithareallylonglabelthatwillbreakeverythingsimple shortshortlong label for testing purposes and it must be really, really longlong label for testing purposes and it must be really, really longshortthis should span many actors lifelines so we know how it will look like when redering a long label over many actors +an actor with a really long label that will break everythinga short oneanactorwithareallylonglabelthatwillbreakeverythingsimple shortshortlong label for testing purposes and it must be really, really longlong label for testing purposes and it must be really, really longshortthis should span many actors lifelines so we know how it will look like when redering a long label over many actors diff --git a/e2etests/testdata/stable/sequence_diagram_actor_distance/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_actor_distance/elk/board.exp.json index 6a65d1acc..bfd562063 100644 --- a/e2etests/testdata/stable/sequence_diagram_actor_distance/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_actor_distance/elk/board.exp.json @@ -14,7 +14,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -53,7 +53,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -92,7 +92,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -131,7 +131,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -196,7 +196,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 4 }, { "id": "(b -> c)[0]", @@ -235,7 +235,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 4 }, { "id": "(a -> b)[1]", @@ -274,7 +274,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 4 }, { "id": "(b -> c)[1]", @@ -313,7 +313,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 4 }, { "id": "(c -> d)[0]", @@ -352,7 +352,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 4 }, { "id": "(a -> d)[0]", @@ -391,7 +391,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 4 }, { "id": "(a -- )[0]", @@ -430,7 +430,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(b -- )[0]", @@ -469,7 +469,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(c -- )[0]", @@ -508,7 +508,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(d -- )[0]", @@ -547,7 +547,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/sequence_diagram_actor_distance/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_actor_distance/elk/sketch.exp.svg index ab5408c09..d1f73d658 100644 --- a/e2etests/testdata/stable/sequence_diagram_actor_distance/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_actor_distance/elk/sketch.exp.svg @@ -14,7 +14,7 @@ width="1753" height="1396" viewBox="-100 -50 1753 1396">an actor with a really long label that will break everythinga short oneanactorwithareallylonglabelthatwillbreakeverythingsimple shortshortlong label for testing purposes and it must be really, really longlong label for testing purposes and it must be really, really longshortthis should span many actors lifelines so we know how it will look like when redering a long label over many actors +an actor with a really long label that will break everythinga short oneanactorwithareallylonglabelthatwillbreakeverythingsimple shortshortlong label for testing purposes and it must be really, really longlong label for testing purposes and it must be really, really longshortthis should span many actors lifelines so we know how it will look like when redering a long label over many actors 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 73b2fad99..b6504c0b0 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 @@ -44,7 +44,7 @@ "id": "b", "type": "oval", "pos": { - "x": 223, + "x": 259, "y": 87 }, "width": 150, @@ -83,7 +83,7 @@ "id": "c", "type": "class", "pos": { - "x": 443, + "x": 289, "y": 50 }, "width": 241, @@ -133,7 +133,7 @@ "id": "d", "type": "cloud", "pos": { - "x": 754, + "x": 441, "y": 108 }, "width": 179, @@ -172,7 +172,7 @@ "id": "e", "type": "code", "pos": { - "x": 1003, + "x": 522, "y": 164 }, "width": 196, @@ -211,7 +211,7 @@ "id": "f", "type": "cylinder", "pos": { - "x": 1269, + "x": 643, "y": 108 }, "width": 150, @@ -250,7 +250,7 @@ "id": "g", "type": "diamond", "pos": { - "x": 1489, + "x": 718, "y": 108 }, "width": 150, @@ -289,7 +289,7 @@ "id": "h", "type": "document", "pos": { - "x": 1709, + "x": 793, "y": 108 }, "width": 150, @@ -328,7 +328,7 @@ "id": "i", "type": "hexagon", "pos": { - "x": 1929, + "x": 852, "y": 108 }, "width": 182, @@ -367,7 +367,7 @@ "id": "j", "type": "image", "pos": { - "x": 2181, + "x": 959, "y": 85 }, "width": 150, @@ -417,7 +417,7 @@ "id": "k", "type": "oval", "pos": { - "x": 2401, + "x": 1034, "y": 108 }, "width": 150, @@ -456,7 +456,7 @@ "id": "l", "type": "package", "pos": { - "x": 2621, + "x": 1109, "y": 108 }, "width": 150, @@ -495,7 +495,7 @@ "id": "m", "type": "page", "pos": { - "x": 2841, + "x": 1171, "y": 108 }, "width": 175, @@ -534,7 +534,7 @@ "id": "n", "type": "parallelogram", "pos": { - "x": 3086, + "x": 1255, "y": 92 }, "width": 183, @@ -573,7 +573,7 @@ "id": "o", "type": "person", "pos": { - "x": 3339, + "x": 1361, "y": 55 }, "width": 154, @@ -612,7 +612,7 @@ "id": "p", "type": "queue", "pos": { - "x": 3563, + "x": 1434, "y": 108 }, "width": 161, @@ -651,7 +651,7 @@ "id": "q", "type": "rectangle", "pos": { - "x": 3794, + "x": 1513, "y": 69 }, "width": 165, @@ -690,7 +690,7 @@ "id": "r", "type": "step", "pos": { - "x": 4029, + "x": 1571, "y": 108 }, "width": 213, @@ -729,7 +729,7 @@ "id": "s", "type": "stored_data", "pos": { - "x": 4312, + "x": 1709, "y": 108 }, "width": 150, @@ -768,7 +768,7 @@ "id": "t", "type": "sql_table", "pos": { - "x": 4532, + "x": 1754, "y": 126 }, "width": 210, @@ -848,7 +848,7 @@ "y": 364 }, { - "x": 298, + "x": 334, "y": 364 } ], @@ -883,11 +883,11 @@ "labelPercentage": 0, "route": [ { - "x": 298, + "x": 334, "y": 494 }, { - "x": 563.5, + "x": 409.5, "y": 494 } ], @@ -922,11 +922,11 @@ "labelPercentage": 0, "route": [ { - "x": 563.5, + "x": 409.5, "y": 624 }, { - "x": 843.5, + "x": 530.5, "y": 624 } ], @@ -961,11 +961,11 @@ "labelPercentage": 0, "route": [ { - "x": 843.5, + "x": 530.5, "y": 754 }, { - "x": 1101, + "x": 620, "y": 754 } ], @@ -1000,11 +1000,11 @@ "labelPercentage": 0, "route": [ { - "x": 1101, + "x": 620, "y": 884 }, { - "x": 1344, + "x": 718, "y": 884 } ], @@ -1039,11 +1039,11 @@ "labelPercentage": 0, "route": [ { - "x": 1344, + "x": 718, "y": 1014 }, { - "x": 1564, + "x": 793, "y": 1014 } ], @@ -1078,11 +1078,11 @@ "labelPercentage": 0, "route": [ { - "x": 1564, + "x": 793, "y": 1144 }, { - "x": 1784, + "x": 868, "y": 1144 } ], @@ -1117,11 +1117,11 @@ "labelPercentage": 0, "route": [ { - "x": 1784, + "x": 868, "y": 1274 }, { - "x": 2020, + "x": 943, "y": 1274 } ], @@ -1156,11 +1156,11 @@ "labelPercentage": 0, "route": [ { - "x": 2020, + "x": 943, "y": 1404 }, { - "x": 2256, + "x": 1034, "y": 1404 } ], @@ -1195,11 +1195,11 @@ "labelPercentage": 0, "route": [ { - "x": 2256, + "x": 1034, "y": 1534 }, { - "x": 2476, + "x": 1109, "y": 1534 } ], @@ -1234,11 +1234,11 @@ "labelPercentage": 0, "route": [ { - "x": 2476, + "x": 1109, "y": 1664 }, { - "x": 2696, + "x": 1184, "y": 1664 } ], @@ -1273,11 +1273,11 @@ "labelPercentage": 0, "route": [ { - "x": 2696, + "x": 1184, "y": 1794 }, { - "x": 2928.5, + "x": 1258.5, "y": 1794 } ], @@ -1312,11 +1312,11 @@ "labelPercentage": 0, "route": [ { - "x": 2928.5, + "x": 1258.5, "y": 1924 }, { - "x": 3177.5, + "x": 1346.5, "y": 1924 } ], @@ -1351,11 +1351,11 @@ "labelPercentage": 0, "route": [ { - "x": 3177.5, + "x": 1346.5, "y": 2054 }, { - "x": 3416, + "x": 1438, "y": 2054 } ], @@ -1390,11 +1390,11 @@ "labelPercentage": 0, "route": [ { - "x": 3416, + "x": 1438, "y": 2184 }, { - "x": 3643.5, + "x": 1514.5, "y": 2184 } ], @@ -1429,11 +1429,11 @@ "labelPercentage": 0, "route": [ { - "x": 3643.5, + "x": 1514.5, "y": 2314 }, { - "x": 3876.5, + "x": 1595.5, "y": 2314 } ], @@ -1468,11 +1468,11 @@ "labelPercentage": 0, "route": [ { - "x": 3876.5, + "x": 1595.5, "y": 2444 }, { - "x": 4135.5, + "x": 1677.5, "y": 2444 } ], @@ -1507,11 +1507,11 @@ "labelPercentage": 0, "route": [ { - "x": 4135.5, + "x": 1677.5, "y": 2574 }, { - "x": 4387, + "x": 1784, "y": 2574 } ], @@ -1546,11 +1546,11 @@ "labelPercentage": 0, "route": [ { - "x": 4387, + "x": 1784, "y": 2704 }, { - "x": 4637, + "x": 1859, "y": 2704 } ], @@ -1624,11 +1624,11 @@ "labelPercentage": 0, "route": [ { - "x": 298, + "x": 334, "y": 234 }, { - "x": 298, + "x": 334, "y": 2834 } ], @@ -1663,11 +1663,11 @@ "labelPercentage": 0, "route": [ { - "x": 563.5, + "x": 409.5, "y": 234 }, { - "x": 563.5, + "x": 409.5, "y": 2834 } ], @@ -1702,11 +1702,11 @@ "labelPercentage": 0, "route": [ { - "x": 843.5, + "x": 530.5, "y": 234 }, { - "x": 843.5, + "x": 530.5, "y": 2834 } ], @@ -1741,11 +1741,11 @@ "labelPercentage": 0, "route": [ { - "x": 1101, + "x": 620, "y": 234 }, { - "x": 1101, + "x": 620, "y": 2834 } ], @@ -1780,11 +1780,11 @@ "labelPercentage": 0, "route": [ { - "x": 1344, + "x": 718, "y": 234 }, { - "x": 1344, + "x": 718, "y": 2834 } ], @@ -1819,11 +1819,11 @@ "labelPercentage": 0, "route": [ { - "x": 1564, + "x": 793, "y": 234 }, { - "x": 1564, + "x": 793, "y": 2834 } ], @@ -1858,11 +1858,11 @@ "labelPercentage": 0, "route": [ { - "x": 1784, + "x": 868, "y": 234 }, { - "x": 1784, + "x": 868, "y": 2834 } ], @@ -1897,11 +1897,11 @@ "labelPercentage": 0, "route": [ { - "x": 2020, + "x": 943, "y": 234 }, { - "x": 2020, + "x": 943, "y": 2834 } ], @@ -1936,11 +1936,11 @@ "labelPercentage": 0, "route": [ { - "x": 2256, + "x": 1034, "y": 239 }, { - "x": 2256, + "x": 1034, "y": 2834 } ], @@ -1975,11 +1975,11 @@ "labelPercentage": 0, "route": [ { - "x": 2476, + "x": 1109, "y": 234 }, { - "x": 2476, + "x": 1109, "y": 2834 } ], @@ -2014,11 +2014,11 @@ "labelPercentage": 0, "route": [ { - "x": 2696, + "x": 1184, "y": 234 }, { - "x": 2696, + "x": 1184, "y": 2834 } ], @@ -2053,11 +2053,11 @@ "labelPercentage": 0, "route": [ { - "x": 2928.5, + "x": 1258.5, "y": 234 }, { - "x": 2928.5, + "x": 1258.5, "y": 2834 } ], @@ -2092,11 +2092,11 @@ "labelPercentage": 0, "route": [ { - "x": 3177.5, + "x": 1346.5, "y": 234 }, { - "x": 3177.5, + "x": 1346.5, "y": 2834 } ], @@ -2131,11 +2131,11 @@ "labelPercentage": 0, "route": [ { - "x": 3416, + "x": 1438, "y": 239 }, { - "x": 3416, + "x": 1438, "y": 2834 } ], @@ -2170,11 +2170,11 @@ "labelPercentage": 0, "route": [ { - "x": 3643.5, + "x": 1514.5, "y": 234 }, { - "x": 3643.5, + "x": 1514.5, "y": 2834 } ], @@ -2209,11 +2209,11 @@ "labelPercentage": 0, "route": [ { - "x": 3876.5, + "x": 1595.5, "y": 234 }, { - "x": 3876.5, + "x": 1595.5, "y": 2834 } ], @@ -2248,11 +2248,11 @@ "labelPercentage": 0, "route": [ { - "x": 4135.5, + "x": 1677.5, "y": 234 }, { - "x": 4135.5, + "x": 1677.5, "y": 2834 } ], @@ -2287,11 +2287,11 @@ "labelPercentage": 0, "route": [ { - "x": 4387, + "x": 1784, "y": 234 }, { - "x": 4387, + "x": 1784, "y": 2834 } ], @@ -2326,11 +2326,11 @@ "labelPercentage": 0, "route": [ { - "x": 4637, + "x": 1859, "y": 234 }, { - "x": 4637, + "x": 1859, "y": 2834 } ], 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 7e13b2b3a..80a3928b3 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 @@ -2,7 +2,7 @@ a labelblabelsa class+ +public() bool +void- +private() int +voidcloudyyyya := 5 b := a + 7 -fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersid -int -name -varchar - result := callThisFunction(obj, 5) midthis sideother side - - - +fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersid +int +name +varchar + result := callThisFunction(obj, 5) midthis sideother side + + + a labelblabelsa class+ -public() bool -void- -private() int -voidcloudyyyya := 5 +a labelblabelsa class+ +public() bool +void- +private() int +voidcloudyyyya := 5 b := a + 7 -fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersid -int -name -varchar - result := callThisFunction(obj, 5) midthis sideother side - - - +fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersid +int +name +varchar + result := callThisFunction(obj, 5) midthis sideother side + + + abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note - - - - - +abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note + + + + + abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note - - - - - +abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note + + + + + 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 + + + + + + + + + + + + + + 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 + + + + + + + + + + + + + + ab a self edge herebetween actorsto descendantto deeper descendantto parentactor - +ab a self edge herebetween actorsto descendantto deeper descendantto parentactor + - - - - - + + + + + ab a self edge herebetween actorsto descendantto deeper descendantto parentactor - +ab a self edge herebetween actorsto descendantto deeper descendantto parentactor + - - - - - + + + + + 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 - - - - - - - - - +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 + + + + + + + + + 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 - - - - - - - - - +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 + + + + + + + + + scoreritemResponseitemessayRubricconceptitemOutcome getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) - - - - - - - - - - - - - +scoreritemResponseitemessayRubricconceptitemOutcome getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) + + + + + + + + + + + + + scoreritemResponseitemessayRubricconceptitemOutcome getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) - - - - - - - - - - - - - +scoreritemResponseitemessayRubricconceptitemOutcome 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) - - - - - - - - - - - - - - - - - - - - - - - - - +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) - - - - - - - - - - - - - - - - - - - - - - - - - +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) + + + + + + + + + + + + + + + + + + + + + + + + + an actor with a really long label that will break everythinga short oneanactorwithareallylonglabelthatwillbreakeverythingsimple shortshortlong label for testing purposes and it must be really, really longlong label for testing purposes and it must be really, really longshortthis should span many actors lifelines so we know how it will look like when redering a long label over many actors - - - - - - - +an actor with a really long label that will break everythinganactorwithareallylonglabelthatwillbreakeverythingsimplea short onefar awaywhat if there were no labels between this actor and the previous one shortlong label for testing purposes and it must be really, really longshortthis should span many actors lifelines so we know how it will look like when redering a long label over many actorslong label for testing purposes and it must be really, really long + + + + + + an actor with a really long label that will break everythinga short oneanactorwithareallylonglabelthatwillbreakeverythingsimple shortshortlong label for testing purposes and it must be really, really longlong label for testing purposes and it must be really, really longshortthis should span many actors lifelines so we know how it will look like when redering a long label over many actors - - - - - - - +an actor with a really long label that will break everythinganactorwithareallylonglabelthatwillbreakeverythingsimplea short onefar awaywhat if there were no labels between this actor and the previous one shortlong label for testing purposes and it must be really, really longshortthis should span many actors lifelines so we know how it will look like when redering a long label over many actorslong label for testing purposes and it must be really, really long + + + + + + a labelblabelsa class+ -public() bool -void- -private() int -voidcloudyyyya := 5 +a labelblabelsa class+ +public() bool +void- +private() int +voidcloudyyyya := 5 b := a + 7 -fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersid -int -name -varchar - result := callThisFunction(obj, 5) midthis sideother side - +fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersid +int +name +varchar + result := callThisFunction(obj, 5) midthis sideother side + - + a labelblabelsa class+ -public() bool -void- -private() int -voidcloudyyyya := 5 +a labelblabelsa class+ +public() bool +void- +private() int +voidcloudyyyya := 5 b := a + 7 -fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersid -int -name -varchar - result := callThisFunction(obj, 5) midthis sideother side - +fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersid +int +name +varchar + result := callThisFunction(obj, 5) midthis sideother side + - + abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note - - - - - +abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note + + + + + abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note - - - - - +abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note + + + + + 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 + + + + + + + + + + + + + + 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 + + + + + + + + + + + + + + ab a self edge herebetween actorsto descendantto deeper descendantto parentactor - +ab a self edge herebetween actorsto descendantto deeper descendantto parentactor + - - - - - + + + + + ab a self edge herebetween actorsto descendantto deeper descendantto parentactor - +ab a self edge herebetween actorsto descendantto deeper descendantto parentactor + - - - - - + + + + + scoreritemResponseitemessayRubricconceptitemOutcome getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) - - - - - - - - - - - - - +scoreritemResponseitemessayRubricconceptitemOutcome getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) + + + + + + + + + + + + + scoreritemResponseitemessayRubricconceptitemOutcome getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) - - - - - - - - - - - - - +scoreritemResponseitemessayRubricconceptitemOutcome 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) - - - - - - - - - - - - - - - - - - - - - - - - - +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) - - - - - - - - - - - - - - - - - - - - - - - - - +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) + + + + + + + + + + + + + + + + + + + + + + + + + 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 7/9] 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">an actor with a really long label that will break everythinganactorwithareallylonglabelthatwillbreakeverythingsimplea short onefar awaywhat if there were no labels between this actor and the previous one shortlong label for testing purposes and it must be really, really longshortthis should span many actors lifelines so we know how it will look like when redering a long label over many actorslong label for testing purposes and it must be really, really long - - - - - - +an actor with a really long label that will break everythinganactorwithareallylonglabelthatwillbreakeverythingsimplea short onefar awaywhat if there were no labels between this actor and the previous one shortlong label for testing purposes and it must be really, really longshortthis should span many actors lifelines so we know how it will look like when redering a long label over many actorslong label for testing purposes and it must be really, really long + + + + + + an actor with a really long label that will break everythinganactorwithareallylonglabelthatwillbreakeverythingsimplea short onefar awaywhat if there were no labels between this actor and the previous one shortlong label for testing purposes and it must be really, really longshortthis should span many actors lifelines so we know how it will look like when redering a long label over many actorslong label for testing purposes and it must be really, really long - - - - - - +an actor with a really long label that will break everythinganactorwithareallylonglabelthatwillbreakeverythingsimplea short onefar awaywhat if there were no labels between this actor and the previous one shortlong label for testing purposes and it must be really, really longshortthis should span many actors lifelines so we know how it will look like when redering a long label over many actorslong label for testing purposes and it must be really, really long + + + + + + a labelblabelsa class+ -public() bool -void- -private() int -voidcloudyyyya := 5 +a labelblabelsa class+ +public() bool +void- +private() int +voidcloudyyyya := 5 b := a + 7 -fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersid -int -name -varchar - result := callThisFunction(obj, 5) midthis sideother side - - - +fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersid +int +name +varchar + result := callThisFunction(obj, 5) midthis sideother side + + + a labelblabelsa class+ -public() bool -void- -private() int -voidcloudyyyya := 5 +a labelblabelsa class+ +public() bool +void- +private() int +voidcloudyyyya := 5 b := a + 7 -fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersid -int -name -varchar - result := callThisFunction(obj, 5) midthis sideother side - - - +fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersid +int +name +varchar + result := callThisFunction(obj, 5) midthis sideother side + + + abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note - - - - - +abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note + + + + + abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note - - - - - +abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note + + + + + ba a note here to remember that padding must consider notes toojustalongnotehere \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_long_note/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_long_note/elk/board.exp.json new file mode 100644 index 000000000..2e66a4eb8 --- /dev/null +++ b/e2etests/testdata/stable/sequence_diagram_long_note/elk/board.exp.json @@ -0,0 +1,280 @@ +{ + "name": "", + "shapes": [ + { + "id": "b", + "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": "", + "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": -187, + "y": 436 + }, + "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": "", + "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", + "type": "", + "pos": { + "x": 313, + "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": "", + "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.note", + "type": "rectangle", + "pos": { + "x": 319, + "y": 692 + }, + "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": "", + "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 + } + ], + "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": 388, + "y": 306 + }, + { + "x": 75, + "y": 306 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "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": 75, + "y": 176 + }, + { + "x": 75, + "y": 1012 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 2 + }, + { + "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": 388, + "y": 176 + }, + { + "x": 388, + "y": 1012 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 2 + } + ] +} diff --git a/e2etests/testdata/stable/sequence_diagram_long_note/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_long_note/elk/sketch.exp.svg new file mode 100644 index 000000000..d73943b18 --- /dev/null +++ b/e2etests/testdata/stable/sequence_diagram_long_note/elk/sketch.exp.svg @@ -0,0 +1,24 @@ + +ba a 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 f2bb4e085..a35a7be98 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 @@ -2,7 +2,7 @@ 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 + + + + + + + + + + + + + + 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 + + + + + + + + + + + + + + ab a self edge herebetween actorsto descendantto deeper descendantto parentactor - +ab a self edge herebetween actorsto descendantto deeper descendantto parentactor + - - - - - + + + + + ab a self edge herebetween actorsto descendantto deeper descendantto parentactor - +ab a self edge herebetween actorsto descendantto deeper descendantto parentactor + - - - - - + + + + + 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 - - - - - - - - - +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 + + + + + + + + + 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 - - - - - - - - - +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 + + + + + + + + + scoreritemResponseitemessayRubricconceptitemOutcome getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) - - - - - - - - - - - - - +scoreritemResponseitemessayRubricconceptitemOutcome getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) + + + + + + + + + + + + + scoreritemResponseitemessayRubricconceptitemOutcome getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) - - - - - - - - - - - - - +scoreritemResponseitemessayRubricconceptitemOutcome 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) - - - - - - - - - - - - - - - - - - - - - - - - - +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) - - - - - - - - - - - - - - - - - - - - - - - - - +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) + + + + + + + + + + + + + + + + + + + + + + + + + bacthis is a message groupand this is a nested message groupwhat about more nestingyoyo \ No newline at end of file diff --git a/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/elk/board.exp.json b/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/elk/board.exp.json new file mode 100644 index 000000000..2a26b1e83 --- /dev/null +++ b/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/elk/board.exp.json @@ -0,0 +1,665 @@ +{ + "name": "", + "shapes": [ + { + "id": "b", + "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": "", + "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": "a", + "type": "", + "pos": { + "x": 250, + "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": "", + "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": "c", + "type": "", + "pos": { + "x": 500, + "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": "", + "fields": null, + "methods": null, + "columns": null, + "label": "c", + "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": "this is a message group", + "type": "", + "pos": { + "x": -71, + "y": 396 + }, + "width": 542, + "height": 696, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#EDF0FD", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "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": 1, + "level": 1 + }, + { + "id": "this is a message group.and this is a nested message group", + "type": "", + "pos": { + "x": -47, + "y": 526 + }, + "width": 494, + "height": 542, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#FFFFFF", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "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": 1, + "level": 2 + }, + { + "id": "this is a message group.and this is a nested message group.what about more nesting", + "type": "", + "pos": { + "x": -23, + "y": 656 + }, + "width": 446, + "height": 388, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#EEF1F8", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "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": 1, + "level": 3 + }, + { + "id": "this is a message group.and this is a nested message group.what about more nesting.yo", + "type": "", + "pos": { + "x": 1, + "y": 786 + }, + "width": 398, + "height": 234, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#FFFFFF", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "yo", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 21, + "labelHeight": 26, + "zIndex": 1, + "level": 4 + }, + { + "id": "this is a message group.and this is a nested message group.what about more nesting.yo.yo", + "type": "", + "pos": { + "x": 25, + "y": 916 + }, + "width": 350, + "height": 80, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#EEF1F8", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "yo", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 21, + "labelHeight": 26, + "zIndex": 1, + "level": 5 + } + ], + "connections": [ + { + "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": 75, + "y": 306 + }, + { + "x": 575, + "y": 306 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "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": 325, + "y": 436 + }, + { + "x": 75, + "y": 436 + } + ], + "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": 325, + "y": 566 + }, + { + "x": 75, + "y": 566 + } + ], + "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": 325, + "y": 696 + }, + { + "x": 75, + "y": 696 + } + ], + "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": 325, + "y": 826 + }, + { + "x": 75, + "y": 826 + } + ], + "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": 325, + "y": 956 + }, + { + "x": 75, + "y": 956 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "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": 75, + "y": 176 + }, + { + "x": 75, + "y": 1086 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 2 + }, + { + "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": 325, + "y": 176 + }, + { + "x": 325, + "y": 1086 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 2 + }, + { + "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": 575, + "y": 176 + }, + { + "x": 575, + "y": 1086 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 2 + } + ] +} diff --git a/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/elk/sketch.exp.svg b/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/elk/sketch.exp.svg new file mode 100644 index 000000000..7663e9dd0 --- /dev/null +++ b/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/elk/sketch.exp.svg @@ -0,0 +1,24 @@ + +bacthis is a message groupand this is a nested message groupwhat about more nestingyoyo \ No newline at end of file diff --git a/e2etests/todo_test.go b/e2etests/todo_test.go index a0cecce13..cc15f14ec 100644 --- a/e2etests/todo_test.go +++ b/e2etests/todo_test.go @@ -66,6 +66,29 @@ ninety nine: { } } `, + }, { + // as nesting gets deeper, the groups advance towards `c` and may overlap its lifeline + // needs to consider the group size when computing the distance from `a` to `c` + // a similar effect can be seen for spans + name: "sequence_diagram_actor_padding_nested_groups", + script: `shape: sequence_diagram +b;a;c +b -> c +this is a message group: { + _.a -> _.b + and this is a nested message group: { + _._.a -> _._.b + what about more nesting: { + _._._.a -> _._._.b + yo: { + _._._._.a -> _._._._.b + yo: { + _._._._._.a -> _._._._._.b + } + } + } + } +}`, }, } From 159e2016a9667bcb37327de9a80ee948d75e6e72 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Mon, 5 Dec 2022 12:09:32 -0800 Subject: [PATCH 9/9] blend groups --- d2exporter/export.go | 1 + d2graph/d2graph.go | 14 +- d2graph/seqdiagram.go | 2 +- d2renderers/d2svg/style.css | 1 + d2themes/d2themes.go | 2 +- e2etests/stable_test.go | 41 + .../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/board.exp.json | 6 +- .../stable/all_shapes/dagre/sketch.exp.svg | 3 +- .../stable/all_shapes/elk/board.exp.json | 6 +- .../stable/all_shapes/elk/sketch.exp.svg | 3 +- .../all_shapes_multiple/dagre/board.exp.json | 6 +- .../all_shapes_multiple/dagre/sketch.exp.svg | 3 +- .../all_shapes_multiple/elk/board.exp.json | 6 +- .../all_shapes_multiple/elk/sketch.exp.svg | 3 +- .../all_shapes_shadow/dagre/board.exp.json | 6 +- .../all_shapes_shadow/dagre/sketch.exp.svg | 3 +- .../all_shapes_shadow/elk/board.exp.json | 6 +- .../all_shapes_shadow/elk/sketch.exp.svg | 3 +- .../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/board.exp.json | 4 +- .../stable/investigate/dagre/sketch.exp.svg | 3 +- .../stable/investigate/elk/board.exp.json | 4 +- .../stable/investigate/elk/sketch.exp.svg | 3 +- .../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 | 20 +- .../dagre/sketch.exp.svg | 3 +- .../elk/board.exp.json | 20 +- .../elk/sketch.exp.svg | 3 +- .../dagre/board.exp.json | 1105 +++++++++++++++++ .../dagre/sketch.exp.svg | 28 + .../elk/board.exp.json | 1105 +++++++++++++++++ .../elk/sketch.exp.svg | 28 + .../dagre/sketch.exp.svg | 1 + .../elk/sketch.exp.svg | 1 + .../dagre/sketch.exp.svg | 1 + .../sequence_diagram_note/elk/sketch.exp.svg | 1 + .../dagre/board.exp.json | 4 +- .../dagre/sketch.exp.svg | 3 +- .../sequence_diagram_real/elk/board.exp.json | 4 +- .../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/board.exp.json | 2 +- .../sequence_diagrams/dagre/sketch.exp.svg | 3 +- .../sequence_diagrams/elk/board.exp.json | 2 +- .../sequence_diagrams/elk/sketch.exp.svg | 3 +- .../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 + 164 files changed, 2517 insertions(+), 74 deletions(-) create mode 100644 e2etests/testdata/stable/sequence_diagram_nested_groups/dagre/board.exp.json create mode 100644 e2etests/testdata/stable/sequence_diagram_nested_groups/dagre/sketch.exp.svg create mode 100644 e2etests/testdata/stable/sequence_diagram_nested_groups/elk/board.exp.json create mode 100644 e2etests/testdata/stable/sequence_diagram_nested_groups/elk/sketch.exp.svg diff --git a/d2exporter/export.go b/d2exporter/export.go index 526304649..c65542362 100644 --- a/d2exporter/export.go +++ b/d2exporter/export.go @@ -100,6 +100,7 @@ func toShape(obj *d2graph.Object, theme *d2themes.Theme) d2target.Shape { shape.FontSize = text.FontSize if obj.IsSequenceDiagramGroup() { + shape.StrokeWidth = 0 shape.Blend = true } diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index e560946f9..8b5f7003e 100644 --- a/d2graph/d2graph.go +++ b/d2graph/d2graph.go @@ -331,18 +331,12 @@ func (l ContainerLevel) LabelSize() int { func (obj *Object) GetFill(theme *d2themes.Theme) string { level := int(obj.Level()) - if obj.Parent.IsSequenceDiagram() { - return theme.Colors.B5 - } else if obj.IsSequenceDiagramNote() { + if obj.IsSequenceDiagramNote() { return theme.Colors.Neutrals.N7 } else if obj.IsSequenceDiagramGroup() { - sd := obj.OuterSequenceDiagram() - // Alternate - if (level-int(sd.Level()))%2 == 0 { - return theme.Colors.Neutrals.N7 - } else { - return theme.Colors.Neutrals.N6 - } + return theme.Colors.Neutrals.N5 + } else if obj.Parent.IsSequenceDiagram() { + return theme.Colors.B5 } shape := obj.Attributes.Shape.Value diff --git a/d2graph/seqdiagram.go b/d2graph/seqdiagram.go index 649756a41..a92cc8924 100644 --- a/d2graph/seqdiagram.go +++ b/d2graph/seqdiagram.go @@ -41,7 +41,7 @@ func (obj *Object) IsSequenceDiagramNote() bool { if obj.OuterSequenceDiagram() == nil { return false } - return !obj.hasEdgeRef() && !obj.ContainsAnyEdge(obj.Graph.Edges) && len(obj.ChildrenArray) == 0 + return !obj.hasEdgeRef() && !obj.ContainsAnyEdge(obj.Graph.Edges) && len(obj.ChildrenArray) == 0 && !obj.ContainsAnyObject(obj.Graph.Objects) } func (obj *Object) hasEdgeRef() bool { diff --git a/d2renderers/d2svg/style.css b/d2renderers/d2svg/style.css index e07084d0f..2476c6ae7 100644 --- a/d2renderers/d2svg/style.css +++ b/d2renderers/d2svg/style.css @@ -8,4 +8,5 @@ } .blend { mix-blend-mode: multiply; + opacity: 0.5; } diff --git a/d2themes/d2themes.go b/d2themes/d2themes.go index 64510eb2f..3cd9f5830 100644 --- a/d2themes/d2themes.go +++ b/d2themes/d2themes.go @@ -44,7 +44,7 @@ var CoolNeutral = Neutral{ N2: "#676C7E", N3: "#9499AB", N4: "#CFD2DD", - N5: "#F0F3F9", + N5: "#DEE1EB", N6: "#EEF1F8", N7: "#FFFFFF", } diff --git a/e2etests/stable_test.go b/e2etests/stable_test.go index a60268d54..a577ccc18 100644 --- a/e2etests/stable_test.go +++ b/e2etests/stable_test.go @@ -1383,6 +1383,47 @@ group b: { choo: { _.d."this note" } +`, + }, + { + name: "sequence_diagram_nested_groups", + script: `shape: sequence_diagram + +this is a message group: { + _.a -> _.b + and this is a nested message group: { + _._.a -> _._.b + what about more nesting: { + _._._.a -> _._._.b + crazy town: { + _._._._.a."a note" + _._._._.a -> _._._._.b + whoa: { + _._._._._.a -> _._._._._.b + } + } + } + } +} + +alt: { + case 1: { + _._.b -> _._.c + } + case 2: { + _._.b -> _._.c + } + case 3: { + _._.b -> _._.c + } + case 4: { + _._.b -> _._.c + } +} + +b.note: "a note here to remember that padding must consider notes too" +a.note: "just\na\nlong\nnote\nhere" +c: "just an actor" `, }, { 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 4e499dd8c..d38113b44 100644 --- a/e2etests/testdata/sanity/1_to_2/dagre/sketch.exp.svg +++ b/e2etests/testdata/sanity/1_to_2/dagre/sketch.exp.svg @@ -14,6 +14,7 @@ width="486" height="552" viewBox="-100 -100 486 552">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">