diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index e76476e8c..8de782117 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -1,62 +1,78 @@ +When we launched D2 to open-source 2 weeks ago, we left the sprint after it a completely +blank slate. Because, while we do have long-term goals, we wanted to make the first +post-launch update focused 100% on addressing the biggest pain points that came up. Thank +you so much to everyone who asked for or complained about something. Every item in this +release was something that was posted on the D2 Discord, a GitHub issue/discussion, a +comment on social media, or an email. + +On top of the listed changes to core D2, we have been building out integrations, starting +with [Obsidian](https://github.com/terrastruct/d2-obsidian). Work has also begun on the +API and Playground. + +If you want a fast way to check out what a change looks like, we put screenshots in the +PRs when it's a visual change. + #### Features ๐Ÿš€ -- Sequence diagrams are now supported. See [docs](https://d2lang.com/tour/sequence-diagrams) for more. +- Sequence diagrams are now supported, experimentally. See + [docs](https://d2lang.com/tour/sequence-diagrams). [#99](https://github.com/terrastruct/d2/issues/99) -- Formatting of d2 scripts is supported on the CLI with the `fmt` subcommand. - [#292](https://github.com/terrastruct/d2/pull/292) -- Latex is now supported. See [docs](https://d2lang.com/tour/text) for more. +- Formatting of d2 scripts is supported on the CLI with the `fmt` subcommand. See `man d2` + or `d2 --help`. [#292](https://github.com/terrastruct/d2/pull/292) +- Latex is now supported. See [docs](https://d2lang.com/tour/text) for how to use. [#229](https://github.com/terrastruct/d2/pull/229) -- `direction` keyword is now supported to specify `up`, `down`, `right`, `left` layouts. See - [docs](https://d2lang.com/tour/layouts) for more. +- `direction` keyword is now supported to specify `up`, `down`, `right`, `left` layouts. + See [docs](https://d2lang.com/tour/layouts) for more. [#251](https://github.com/terrastruct/d2/pull/251) -- Self-referencing connections are now valid. E.g. `x -> x`. - [#273](https://github.com/terrastruct/d2/pull/273) +- Self-referencing connections are now valid. E.g. `x -> x`. Render will vary based on + layout engine. [#273](https://github.com/terrastruct/d2/pull/273) - Arrowhead labels are now supported. [#182](https://github.com/terrastruct/d2/pull/182) -- `stroke-dash` on shapes is now supported. [#188](https://github.com/terrastruct/d2/issues/188) -- `font-color` is now supported on shapes and connections. [#215](https://github.com/terrastruct/d2/pull/215) -- `font-size` is now supported on shapes and connections. [#250](https://github.com/terrastruct/d2/pull/250) -- Querying shapes and connections by ID is now supported in renders. [#218](https://github.com/terrastruct/d2/pull/218) +- Support for `stroke-dash` on shapes. + [#188](https://github.com/terrastruct/d2/issues/188) +- Support for `font-color` on shapes and connections. + [#215](https://github.com/terrastruct/d2/pull/215) +- Support for `font-size` on shapes and connections. + [#250](https://github.com/terrastruct/d2/pull/250) +- HTML IDs are now added in the SVG output. You can use this to query shapes and + connections by ID post-render. [#218](https://github.com/terrastruct/d2/pull/218) +- `-b/--bundle` flag to `d2` bundles all image assets directly as base64 data urls. + [#278](https://github.com/terrastruct/d2/pull/278) - [install.sh](./install.sh) now accepts `-d` as an alias for `--dry-run`. [#266](https://github.com/terrastruct/d2/pull/266) -- `-b/--bundle` flag to `d2` now works and bundles all image assets directly as base64 - data urls. [#278](https://github.com/terrastruct/d2/pull/278) #### Improvements ๐Ÿงน -- Local images can now be included, e.g. `icon: ./my_img.png`. - [#146](https://github.com/terrastruct/d2/issues/146) +- Local images can now be used for values to the `icon` keyword, e.g. `icon: + ./my_img.png`. [#146](https://github.com/terrastruct/d2/issues/146) - Connection labels no longer overlap other connections. [#332](https://github.com/terrastruct/d2/pull/332) - ELK layout engine now defaults to top-down to be consistent with dagre. [#251](https://github.com/terrastruct/d2/pull/251) -- [install.sh](./install.sh) prints the dry run message more visibly. - [#266](https://github.com/terrastruct/d2/pull/266) -- `d2` now lives in the root folder of the repository instead of as a subcommand. - So you can run `go install oss.terrastruct.com/d2@latest` to install from source - now. - [#290](https://github.com/terrastruct/d2/pull/290) - Container default font styling is no longer bold. Everything used to look too bold. [#358](https://github.com/terrastruct/d2/pull/358) -- `BROWSER=0` now works to disable opening a browser on `--watch`. +- `BROWSER=0` will disable opening a browser on `--watch`. [#311](https://github.com/terrastruct/d2/pull/311) +- [install.sh](./install.sh) prints the dry run message more visibly. + [#266](https://github.com/terrastruct/d2/pull/266) +- `d2` now lives in the root folder of the repository instead of as a subcommand. So you + can now run `go install oss.terrastruct.com/d2@latest` to install from source. + [#290](https://github.com/terrastruct/d2/pull/290) #### Bugfixes โ›‘๏ธ - 3D style was missing border and other styles for its top and right faces. [#187](https://github.com/terrastruct/d2/pull/187) -- System dark mode was incorrectly applying to markdown in renders. +- System dark mode was incorrectly applying to Markdown in renders. [#159](https://github.com/terrastruct/d2/issues/159) -- Fixes markdown newlines created with a trailing double space or backslash. +- Fixes Markdown newlines created with a trailing double space or backslash. [#214](https://github.com/terrastruct/d2/pull/214) - Fixes images not loading in PNG exports. [#224](https://github.com/terrastruct/d2/pull/224) -- Fixes label and icon overlapping each other in dagre and elk layouts. +- Fixes label and icon overlapping each other in dagre and ELK layouts. [#343](https://github.com/terrastruct/d2/pull/343) -- Avoid logging benign file watching errors. +- No longer log benign file-watching errors. [#293](https://github.com/terrastruct/d2/pull/293) -- `$BROWSER` now works to open a custom browser correctly. - For example, to open Firefox on macOS: `BROWSER='open -aFirefox'` - [#311](https://github.com/terrastruct/d2/pull/311) +- `$BROWSER` now works to open a custom browser correctly. For example, to open Firefox on + macOS: `BROWSER='open -a Firefox'` [#311](https://github.com/terrastruct/d2/pull/311) - Fixes numbered IDs being wrongly positioned in `dagre` - [#321](https://github.com/terrastruct/d2/issues/321). Thank you @pleshevskiy for the - report. + [#321](https://github.com/terrastruct/d2/issues/321). diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index fa5f12f07..90d54bc6d 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -1347,10 +1347,23 @@ y -> x.style if len(g.Objects) != 1 { t.Fatal(g.Objects) } + assert.String(t, `"b\nb"`, g.Objects[0].ID) assert.String(t, `b b`, g.Objects[0].Attributes.Label.Value) }, }, + { + name: "unescaped_id_cr", + + text: `b\rb`, + assertions: func(t *testing.T, g *d2graph.Graph) { + if len(g.Objects) != 1 { + t.Fatal(g.Objects) + } + assert.String(t, "b\rb", g.Objects[0].ID) + assert.String(t, "b\rb", g.Objects[0].Attributes.Label.Value) + }, + }, { name: "class_style", diff --git a/d2exporter/export.go b/d2exporter/export.go index 2f8e5ec40..1f2a15b8d 100644 --- a/d2exporter/export.go +++ b/d2exporter/export.go @@ -99,6 +99,15 @@ func toShape(obj *d2graph.Object, theme *d2themes.Theme) d2target.Shape { shape.Italic = text.IsItalic shape.FontSize = text.FontSize + if obj.IsSequenceDiagram() { + shape.StrokeWidth = 0 + } + + if obj.IsSequenceDiagramGroup() { + shape.StrokeWidth = 0 + shape.Blend = true + } + applyStyles(shape, obj) applyTheme(shape, obj, theme) shape.Color = text.GetColor(theme, shape.Italic) diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index e560946f9..b7af9f2a3 100644 --- a/d2graph/d2graph.go +++ b/d2graph/d2graph.go @@ -305,18 +305,6 @@ func (s *Style) Apply(key, value string) error { type ContainerLevel int -func (l ContainerLevel) Fill() string { - // Darkest (least nested) to lightest (most nested) - if l == 1 { - return "#E3E9FD" - } else if l == 2 { - return "#EDF0FD" - } else if l == 3 { - return "#F7F8FE" - } - return "#FFFFFF" -} - func (l ContainerLevel) LabelSize() int { // Largest to smallest if l == 1 { @@ -331,18 +319,32 @@ 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.N5 + } else if obj.Parent.IsSequenceDiagram() { + return theme.Colors.B5 + } + + // fill for spans + sd := obj.OuterSequenceDiagram() + if sd != nil { + level -= int(sd.Level()) + if level == 1 { + return theme.Colors.B3 + } else if level == 2 { + return theme.Colors.B4 + } else if level == 3 { + return theme.Colors.B5 + } else if level == 4 { return theme.Colors.Neutrals.N6 } + return theme.Colors.Neutrals.N7 + } + + if obj.IsSequenceDiagram() { + return theme.Colors.Neutrals.N7 } shape := obj.Attributes.Shape.Value diff --git a/d2graph/seqdiagram.go b/d2graph/seqdiagram.go index bc40d387b..a92cc8924 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 @@ -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 { @@ -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/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index 3b6885bf8..def678ee0 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -256,15 +256,23 @@ func setGraphAttrs(attrs dagreGraphAttrs) string { ) } +func escapeID(id string) string { + id = strings.ReplaceAll(id, `\n`, `\\n`) + // avoid an unescaped \r becoming a \n in the layout result + id = strings.ReplaceAll(id, "\r", `\r`) + return id +} + func generateAddNodeLine(id string, width, height int) string { + id = escapeID(id) return fmt.Sprintf("g.setNode(`%s`, { id: `%s`, width: %d, height: %d });\n", id, id, width, height) } func generateAddParentLine(childID, parentID string) string { - return fmt.Sprintf("g.setParent(`%s`, `%s`);\n", childID, parentID) + return fmt.Sprintf("g.setParent(`%s`, `%s`);\n", escapeID(childID), escapeID(parentID)) } func generateAddEdgeLine(fromID, toID, edgeID string) string { // in dagre v is from, w is to, name is to uniquely identify - return fmt.Sprintf("g.setEdge({v:`%s`, w:`%s`, name:`%s` });\n", fromID, toID, edgeID) + return fmt.Sprintf("g.setEdge({v:`%s`, w:`%s`, name:`%s` });\n", escapeID(fromID), escapeID(toID), escapeID(edgeID)) } diff --git a/d2layouts/d2sequence/constants.go b/d2layouts/d2sequence/constants.go index 78ff0ce16..95de80681 100644 --- a/d2layouts/d2sequence/constants.go +++ b/d2layouts/d2sequence/constants.go @@ -6,7 +6,7 @@ const HORIZONTAL_PAD = 50. // leaves at least 25 units of space on the top/bottom when computing the space required between messages const VERTICAL_PAD = 50. -const MIN_ACTOR_DISTANCE = 70. +const MIN_ACTOR_DISTANCE = 250. const MIN_ACTOR_WIDTH = 150. @@ -36,9 +36,9 @@ const LIFELINE_STROKE_DASH int = 6 const LIFELINE_LABEL_PAD = 5. const ( - GROUP_Z_INDEX = 1 - LIFELINE_Z_INDEX = 2 - SPAN_Z_INDEX = 3 + LIFELINE_Z_INDEX = 1 + SPAN_Z_INDEX = 2 + GROUP_Z_INDEX = 3 MESSAGE_Z_INDEX = 4 NOTE_Z_INDEX = 5 ) diff --git a/d2layouts/d2sequence/layout.go b/d2layouts/d2sequence/layout.go index 33e82a0a4..7940e13b1 100644 --- a/d2layouts/d2sequence/layout.go +++ b/d2layouts/d2sequence/layout.go @@ -32,6 +32,9 @@ func Layout(ctx context.Context, g *d2graph.Graph, layout func(ctx context.Conte for len(queue) > 0 { obj := queue[0] queue = queue[1:] + if len(obj.ChildrenArray) == 0 { + continue + } if obj.Attributes.Shape.Value != d2target.ShapeSequenceDiagram { queue = append(queue, obj.ChildrenArray...) continue @@ -43,7 +46,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, layout func(ctx context.Conte } obj.Children = make(map[string]*d2graph.Object) obj.ChildrenArray = nil - obj.Box = geo.NewBox(nil, sd.getWidth(), sd.getHeight()) + obj.Box = geo.NewBox(nil, sd.getWidth()+GROUP_CONTAINER_PADDING*2, sd.getHeight()+GROUP_CONTAINER_PADDING*2) obj.LabelPosition = go2.Pointer(string(label.InsideTopCenter)) sequenceDiagrams[obj.AbsID()] = sd @@ -141,14 +144,26 @@ func cleanup(g *d2graph.Graph, sequenceDiagrams map[string]*sequenceDiagram, obj obj.LabelPosition = go2.Pointer(string(label.InsideTopCenter)) sd := sequenceDiagrams[obj.AbsID()] - // shift the sequence diagrams as they are always placed at (0, 0) - sd.shift(obj.TopLeft) + // shift the sequence diagrams as they are always placed at (0, 0) with some padding + sd.shift( + geo.NewPoint( + obj.TopLeft.X+GROUP_CONTAINER_PADDING, + obj.TopLeft.Y+GROUP_CONTAINER_PADDING, + ), + ) obj.Children = make(map[string]*d2graph.Object) + obj.ChildrenArray = make([]*d2graph.Object, 0) for _, child := range sd.actors { obj.Children[child.ID] = child + obj.ChildrenArray = append(obj.ChildrenArray, child) + } + for _, child := range sd.groups { + if child.Parent.AbsID() == obj.AbsID() { + obj.Children[child.ID] = child + obj.ChildrenArray = append(obj.ChildrenArray, child) + } } - obj.ChildrenArray = sd.actors g.Edges = append(g.Edges, sequenceDiagrams[obj.AbsID()].messages...) g.Edges = append(g.Edges, sequenceDiagrams[obj.AbsID()].lifelines...) diff --git a/d2layouts/d2sequence/sequence_diagram.go b/d2layouts/d2sequence/sequence_diagram.go index 10230e8fb..47c1f16ed 100644 --- a/d2layouts/d2sequence/sequence_diagram.go +++ b/d2layouts/d2sequence/sequence_diagram.go @@ -32,6 +32,10 @@ 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 maxActorHeight float64 @@ -72,9 +76,7 @@ func newSequenceDiagram(objects []*d2graph.Object, messages []*d2graph.Edge) *se curr := queue[0] groups = append(groups, curr) queue = queue[1:] - for _, c := range curr.ChildrenArray { - queue = append(queue, c) - } + queue = append(queue, curr.ChildrenArray...) } } else { actors = append(actors, obj) @@ -91,6 +93,7 @@ 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, maxActorHeight: 0., verticalIndices: make(map[string]int), @@ -107,6 +110,7 @@ func newSequenceDiagram(objects []*d2graph.Object, messages []*d2graph.Edge) *se queue := make([]*d2graph.Object, len(actor.ChildrenArray)) copy(queue, actor.ChildrenArray) + maxNoteWidth := 0. for len(queue) > 0 { child := queue[0] queue = queue[1:] @@ -119,6 +123,7 @@ func newSequenceDiagram(objects []*d2graph.Object, messages []*d2graph.Edge) *se sd.notes = append(sd.notes, child) sd.objectRank[child] = rank child.LabelPosition = go2.Pointer(string(label.InsideMiddleCenter)) + maxNoteWidth = math.Max(maxNoteWidth, child.Width) } else { // spans have no labels // TODO why not? Spans should be able to @@ -130,12 +135,32 @@ func newSequenceDiagram(objects []*d2graph.Object, messages []*d2graph.Edge) *se queue = append(queue, child.ChildrenArray...) } + + if rank != len(actors)-1 { + actorHW := actor.Width / 2. + nextActorHW := actors[rank+1].Width / 2. + sd.actorXStep[rank] = math.Max(actorHW+nextActorHW+HORIZONTAL_PAD, MIN_ACTOR_DISTANCE) + sd.actorXStep[rank] = math.Max(maxNoteWidth/2.+HORIZONTAL_PAD, sd.actorXStep[rank]) + if rank > 0 { + sd.actorXStep[rank-1] = math.Max(maxNoteWidth/2.+HORIZONTAL_PAD, sd.actorXStep[rank-1]) + } + } } for _, message := range sd.messages { sd.verticalIndices[message.AbsID()] = getEdgeEarliestLineNum(message) sd.yStep = math.Max(sd.yStep, float64(message.LabelDimensions.Height)) + // ensures that long labels, spanning over multiple actors, don't make for large gaps between actors + // by distributing the label length across the actors rank difference + rankDiff := math.Abs(float64(sd.objectRank[message.Src]) - float64(sd.objectRank[message.Dst])) + if rankDiff != 0 { + // rankDiff = 0 for self edges + distributedLabelWidth := float64(message.LabelDimensions.Width) / rankDiff + 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 { sd.firstMessage[message.Src] = message @@ -241,10 +266,10 @@ 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. - for _, actor := range sd.actors { + centerX := sd.actors[0].Width / 2. + for rank, actor := range sd.actors { shape := actor.Attributes.Shape.Value var yOffset float64 if shape == d2target.ShapeImage || shape == d2target.ShapePerson { @@ -257,8 +282,11 @@ 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 + MIN_ACTOR_DISTANCE + halfWidth := actor.Width / 2. + actor.TopLeft = geo.NewPoint(math.Round(centerX-halfWidth), yOffset) + if rank != len(sd.actors)-1 { + centerX += sd.actorXStep[rank] + } } } @@ -511,6 +539,8 @@ func (sd *sequenceDiagram) getHeight() float64 { func (sd *sequenceDiagram) shift(tl *geo.Point) { allObjects := append([]*d2graph.Object{}, sd.actors...) allObjects = append(allObjects, sd.spans...) + allObjects = append(allObjects, sd.groups...) + allObjects = append(allObjects, sd.notes...) for _, obj := range allObjects { obj.TopLeft.X += tl.X obj.TopLeft.Y += tl.Y diff --git a/d2renderers/d2svg/d2svg.go b/d2renderers/d2svg/d2svg.go index e46a0fb79..77214ce3f 100644 --- a/d2renderers/d2svg/d2svg.go +++ b/d2renderers/d2svg/d2svg.go @@ -604,7 +604,12 @@ func drawShape(writer io.Writer, targetShape d2target.Shape) error { } } - fmt.Fprintf(writer, ``, shadowAttr) + var blendModeClass string + if targetShape.Blend { + blendModeClass = " blend" + } + + fmt.Fprintf(writer, ``, blendModeClass, shadowAttr) var multipleTL *geo.Point if targetShape.Multiple { @@ -632,7 +637,7 @@ func drawShape(writer io.Writer, targetShape d2target.Shape) error { targetShape.Pos.X, targetShape.Pos.Y, targetShape.Width, targetShape.Height, style) // TODO should standardize "" to rectangle - case d2target.ShapeRectangle, "": + case d2target.ShapeRectangle, d2target.ShapeSequenceDiagram, "": if targetShape.ThreeDee { fmt.Fprint(writer, render3dRect(targetShape)) } else { diff --git a/d2renderers/d2svg/style.css b/d2renderers/d2svg/style.css index f5cffa9cc..2476c6ae7 100644 --- a/d2renderers/d2svg/style.css +++ b/d2renderers/d2svg/style.css @@ -6,3 +6,7 @@ stroke-linecap: round; stroke-linejoin: round; } +.blend { + mix-blend-mode: multiply; + opacity: 0.5; +} diff --git a/d2target/d2target.go b/d2target/d2target.go index 9c2dd2c9b..f8c0ff0cc 100644 --- a/d2target/d2target.go +++ b/d2target/d2target.go @@ -111,6 +111,10 @@ type Shape struct { Icon *url.URL `json:"icon"` IconPosition string `json:"iconPosition"` + // Whether the shape should allow shapes behind it to bleed through + // Currently just used for sequence diagram groups + Blend bool `json:"blend"` + Class SQLTable diff --git a/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/regression_test.go b/e2etests/regression_test.go index d2ec37c80..8170bc359 100644 --- a/e2etests/regression_test.go +++ b/e2etests/regression_test.go @@ -5,7 +5,30 @@ import ( ) func testRegression(t *testing.T) { - tcs := []testCase{} + tcs := []testCase{ + { + name: "dagre_id_with_newline", + script: ` +ninety\nnine +eighty\reight +seventy\r\nseven +`, + }, + { + name: "empty_sequence", + script: ` +A: hello { + shape: sequence_diagram +} + +B: goodbye { + shape: sequence_diagram +} + +A->B +`, + }, + } runa(t, tcs) } diff --git a/e2etests/stable_test.go b/e2etests/stable_test.go index a60268d54..230528899 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" `, }, { @@ -1411,6 +1452,28 @@ choo: { } `, }, + { + name: "sequence_diagram_actor_distance", + script: `shape: sequence_diagram +a: "an actor with a really long label that will break everything" +c: "an\nactor\nwith\na\nreally\nlong\nlabel\nthat\nwill\nbreak\neverything" +d: "simple" +e: "a short one" +b: "far away" +f: "what if there were no labels between this actor and the previous one" +a -> b: "short" +a -> b: "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" +d -> e: "long label for testing purposes and it must be really, really long" +a -> f`, + }, { + name: "sequence_diagram_long_note", + script: `shape: sequence_diagram +a -> b +b.note: "a note here to remember that padding must consider notes too" +a.note: "just\na\nlong\nnote\nhere"`, + }, } runa(t, tcs) diff --git a/e2etests/testdata/regression/dagre_id_with_newline/dagre/board.exp.json b/e2etests/testdata/regression/dagre_id_with_newline/dagre/board.exp.json new file mode 100644 index 000000000..83a5c2112 --- /dev/null +++ b/e2etests/testdata/regression/dagre_id_with_newline/dagre/board.exp.json @@ -0,0 +1,126 @@ +{ + "name": "", + "shapes": [ + { + "id": "\"ninety\\nnine\"", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 151, + "height": 142, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "ninety\nnine", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 51, + "labelHeight": 42, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "eighty\reight", + "type": "", + "pos": { + "x": 211, + "y": 8 + }, + "width": 151, + "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": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "eighty\reight", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 51, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "\"seventy\r\\nseven\"", + "type": "", + "pos": { + "x": 422, + "y": 0 + }, + "width": 162, + "height": 142, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "seventy\r\nseven", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 62, + "labelHeight": 42, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [] +} diff --git a/e2etests/testdata/regression/dagre_id_with_newline/dagre/sketch.exp.svg b/e2etests/testdata/regression/dagre_id_with_newline/dagre/sketch.exp.svg new file mode 100644 index 000000000..89f85e41d --- /dev/null +++ b/e2etests/testdata/regression/dagre_id_with_newline/dagre/sketch.exp.svg @@ -0,0 +1,28 @@ + +ninetynineeighty eightseventy seven \ No newline at end of file diff --git a/e2etests/testdata/regression/dagre_id_with_newline/elk/board.exp.json b/e2etests/testdata/regression/dagre_id_with_newline/elk/board.exp.json new file mode 100644 index 000000000..16a7fb9d5 --- /dev/null +++ b/e2etests/testdata/regression/dagre_id_with_newline/elk/board.exp.json @@ -0,0 +1,126 @@ +{ + "name": "", + "shapes": [ + { + "id": "\"ninety\\nnine\"", + "type": "", + "pos": { + "x": 194, + "y": 12 + }, + "width": 151, + "height": 142, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "ninety\nnine", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 51, + "labelHeight": 42, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "eighty\reight", + "type": "", + "pos": { + "x": 365, + "y": 20 + }, + "width": 151, + "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": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "eighty\reight", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 51, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "\"seventy\r\\nseven\"", + "type": "", + "pos": { + "x": 12, + "y": 12 + }, + "width": 162, + "height": 142, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "seventy\r\nseven", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 62, + "labelHeight": 42, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [] +} diff --git a/e2etests/testdata/regression/dagre_id_with_newline/elk/sketch.exp.svg b/e2etests/testdata/regression/dagre_id_with_newline/elk/sketch.exp.svg new file mode 100644 index 000000000..3f5b214b7 --- /dev/null +++ b/e2etests/testdata/regression/dagre_id_with_newline/elk/sketch.exp.svg @@ -0,0 +1,28 @@ + +ninetynineeighty eightseventy seven \ No newline at end of file diff --git a/e2etests/testdata/regression/empty_sequence/dagre/board.exp.json b/e2etests/testdata/regression/empty_sequence/dagre/board.exp.json new file mode 100644 index 000000000..a2abea372 --- /dev/null +++ b/e2etests/testdata/regression/empty_sequence/dagre/board.exp.json @@ -0,0 +1,135 @@ +{ + "name": "", + "shapes": [ + { + "id": "A", + "type": "sequence_diagram", + "pos": { + "x": 13, + "y": 0 + }, + "width": 140, + "height": 126, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 0, + "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": "hello", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 40, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "B", + "type": "sequence_diagram", + "pos": { + "x": 0, + "y": 226 + }, + "width": 166, + "height": 126, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 0, + "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": "goodbye", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 66, + "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": 83, + "y": 126 + }, + { + "x": 83, + "y": 166 + }, + { + "x": 83, + "y": 186 + }, + { + "x": 83, + "y": 226 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ] +} diff --git a/e2etests/testdata/regression/empty_sequence/dagre/sketch.exp.svg b/e2etests/testdata/regression/empty_sequence/dagre/sketch.exp.svg new file mode 100644 index 000000000..688d32c63 --- /dev/null +++ b/e2etests/testdata/regression/empty_sequence/dagre/sketch.exp.svg @@ -0,0 +1,28 @@ + +hellogoodbye \ No newline at end of file diff --git a/e2etests/testdata/regression/empty_sequence/elk/board.exp.json b/e2etests/testdata/regression/empty_sequence/elk/board.exp.json new file mode 100644 index 000000000..e5224a34d --- /dev/null +++ b/e2etests/testdata/regression/empty_sequence/elk/board.exp.json @@ -0,0 +1,126 @@ +{ + "name": "", + "shapes": [ + { + "id": "A", + "type": "sequence_diagram", + "pos": { + "x": 25, + "y": 12 + }, + "width": 140, + "height": 126, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 0, + "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": "hello", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 40, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "B", + "type": "sequence_diagram", + "pos": { + "x": 12, + "y": 238 + }, + "width": 166, + "height": 126, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 0, + "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": "goodbye", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 66, + "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": 95, + "y": 138 + }, + { + "x": 95, + "y": 238 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ] +} diff --git a/e2etests/testdata/regression/empty_sequence/elk/sketch.exp.svg b/e2etests/testdata/regression/empty_sequence/elk/sketch.exp.svg new file mode 100644 index 000000000..34c98543a --- /dev/null +++ b/e2etests/testdata/regression/empty_sequence/elk/sketch.exp.svg @@ -0,0 +1,28 @@ + +hellogoodbye \ No newline at end of file diff --git a/e2etests/testdata/sanity/1_to_2/dagre/board.exp.json b/e2etests/testdata/sanity/1_to_2/dagre/board.exp.json index 7649f1aa0..53c443478 100644 --- a/e2etests/testdata/sanity/1_to_2/dagre/board.exp.json +++ b/e2etests/testdata/sanity/1_to_2/dagre/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -62,6 +63,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -101,6 +103,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, diff --git a/e2etests/testdata/sanity/1_to_2/dagre/sketch.exp.svg b/e2etests/testdata/sanity/1_to_2/dagre/sketch.exp.svg index 8e0b6bde3..d38113b44 100644 --- a/e2etests/testdata/sanity/1_to_2/dagre/sketch.exp.svg +++ b/e2etests/testdata/sanity/1_to_2/dagre/sketch.exp.svg @@ -12,6 +12,10 @@ width="486" height="552" viewBox="-100 -100 486 552">abc abc ab ab acbd acbd ab hello diff --git a/e2etests/testdata/sanity/connection_label/elk/board.exp.json b/e2etests/testdata/sanity/connection_label/elk/board.exp.json index 2680db2b1..be654cbef 100644 --- a/e2etests/testdata/sanity/connection_label/elk/board.exp.json +++ b/e2etests/testdata/sanity/connection_label/elk/board.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -62,6 +63,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, diff --git a/e2etests/testdata/sanity/connection_label/elk/sketch.exp.svg b/e2etests/testdata/sanity/connection_label/elk/sketch.exp.svg index 72194bada..2c8181f9a 100644 --- a/e2etests/testdata/sanity/connection_label/elk/sketch.exp.svg +++ b/e2etests/testdata/sanity/connection_label/elk/sketch.exp.svg @@ -12,6 +12,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..0ca3e31ac 100644 --- a/e2etests/testdata/sanity/empty/dagre/sketch.exp.svg +++ b/e2etests/testdata/sanity/empty/dagre/sketch.exp.svg @@ -12,6 +12,10 @@ width="202" height="202" viewBox="9223372036854775707 9223372036854775707 202 20 stroke-linecap: round; stroke-linejoin: round; } +.blend { + mix-blend-mode: multiply; + opacity: 0.5; +} ]]> \ 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..0ca3e31ac 100644 --- a/e2etests/testdata/sanity/empty/elk/sketch.exp.svg +++ b/e2etests/testdata/sanity/empty/elk/sketch.exp.svg @@ -12,6 +12,10 @@ width="202" height="202" viewBox="9223372036854775707 9223372036854775707 202 20 stroke-linecap: round; stroke-linejoin: round; } +.blend { + mix-blend-mode: multiply; + opacity: 0.5; +} ]]> \ 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 b9fae223a..250620797 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, @@ -131,7 +134,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F0F3F9", + "fill": "#DEE1EB", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -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, @@ -248,7 +254,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F0F3F9", + "fill": "#DEE1EB", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -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, @@ -599,7 +614,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F0F3F9", + "fill": "#DEE1EB", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -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 354d02711..f6e2918f0 100644 --- a/e2etests/testdata/stable/all_shapes/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes/dagre/sketch.exp.svg @@ -12,9 +12,13 @@ width="1539" height="824" viewBox="-100 -100 1539 824">rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud @@ -22,7 +26,7 @@ width="1539" height="824" viewBox="-100 -100 1539 824"> @@ -22,7 +26,7 @@ width="1352" height="824" viewBox="-88 -88 1352 824">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..0021a9490 100644 --- a/e2etests/testdata/stable/arrowhead_labels/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/arrowhead_labels/elk/sketch.exp.svg @@ -12,6 +12,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..99e24560c 100644 --- a/e2etests/testdata/stable/binary_tree/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/binary_tree/dagre/sketch.exp.svg @@ -12,6 +12,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..62b3bffda 100644 --- a/e2etests/testdata/stable/chaos1/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/chaos1/elk/sketch.exp.svg @@ -12,6 +12,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..06d891441 100644 --- a/e2etests/testdata/stable/chaos2/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/chaos2/dagre/sketch.exp.svg @@ -12,6 +12,10 @@ width="1317" height="1854" viewBox="-100 -100 1317 1854">abcd abcd abc abc BatchManager- 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..d1ad09c80 100644 --- a/e2etests/testdata/stable/class/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/class/elk/sketch.exp.svg @@ -12,6 +12,10 @@ width="539" height="568" viewBox="-88 -88 539 568">BatchManager- 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..d0f72c05b 100644 --- a/e2etests/testdata/stable/code_snippet/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/code_snippet/dagre/sketch.exp.svg @@ -12,6 +12,10 @@ width="955" height="818" viewBox="-100 -100 955 818">// RegisterHash registers a function that returns a new instance of the given 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..32886df43 100644 --- a/e2etests/testdata/stable/code_snippet/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/code_snippet/elk/sketch.exp.svg @@ -12,6 +12,10 @@ width="955" height="818" viewBox="-88 -88 955 818">// RegisterHash registers a function that returns a new instance of the given 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..c8660184a 100644 --- a/e2etests/testdata/stable/connected_container/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/connected_container/dagre/sketch.exp.svg @@ -12,6 +12,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..0de53302e 100644 --- a/e2etests/testdata/stable/font_colors/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/font_colors/elk/sketch.exp.svg @@ -12,6 +12,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..5a3a34239 100644 --- a/e2etests/testdata/stable/font_sizes/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/font_sizes/dagre/sketch.exp.svg @@ -12,6 +12,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..02055f08d 100644 --- a/e2etests/testdata/stable/font_sizes/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/font_sizes/elk/sketch.exp.svg @@ -12,6 +12,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..91b32cb2e 100644 --- a/e2etests/testdata/stable/giant_markdown_test/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/giant_markdown_test/dagre/sketch.exp.svg @@ -12,6 +12,10 @@ width="3251" height="5500" viewBox="-100 -100 3251 5500">hellohelloab ab 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 8f9f4f4bf..6e983b96d 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, @@ -443,7 +454,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F0F3F9", + "fill": "#DEE1EB", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -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, @@ -532,7 +545,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F0F3F9", + "fill": "#DEE1EB", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -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..6655cd820 100644 --- a/e2etests/testdata/stable/investigate/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/investigate/elk/sketch.exp.svg @@ -12,9 +12,13 @@ width="860" height="4868" viewBox="-82 -88 860 4868">aabbccddllffwwyynniijjkkssuurmeemmmmgghhzzooppqqrrttvvxxabac 123456 +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..13eab90b5 100644 --- a/e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg @@ -12,6 +12,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..fc638568c 100644 --- a/e2etests/testdata/stable/self-referencing/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/self-referencing/elk/sketch.exp.svg @@ -12,6 +12,10 @@ width="572" height="552" viewBox="-70 -88 572 552">xyz hello 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..2341f4127 --- /dev/null +++ b/e2etests/testdata/stable/sequence_diagram_actor_distance/dagre/board.exp.json @@ -0,0 +1,715 @@ +{ + "name": "", + "shapes": [ + { + "id": "a", + "type": "", + "pos": { + "x": 24, + "y": 234 + }, + "width": 487, + "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": "an actor with a really long label that will break everything", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 387, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "c", + "type": "", + "pos": { + "x": 602, + "y": 74 + }, + "width": 177, + "height": 286, + "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": "an\nactor\nwith\na\nreally\nlong\nlabel\nthat\nwill\nbreak\neverything", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 77, + "labelHeight": 186, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "d", + "type": "", + "pos": { + "x": 1038, + "y": 234 + }, + "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": "simple", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 50, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "e", + "type": "", + "pos": { + "x": 1484, + "y": 234 + }, + "width": 180, + "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 short one", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 80, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "b", + "type": "", + "pos": { + "x": 1742, + "y": 234 + }, + "width": 163, + "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": "far away", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 63, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "f", + "type": "", + "pos": { + "x": 1955, + "y": 234 + }, + "width": 561, + "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": "what if there were no labels between this actor and the previous one", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 461, + "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": 267.5, + "y": 490 + }, + { + "x": 1823.5, + "y": 490 + } + ], + "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": "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": 267.5, + "y": 620 + }, + { + "x": 1823.5, + "y": 620 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "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": 690.5, + "y": 750 + }, + { + "x": 1113, + "y": 750 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "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": 267.5, + "y": 880 + }, + { + "x": 1113, + "y": 880 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "id": "(d -> e)[0]", + "src": "d", + "srcArrow": "none", + "srcLabel": "", + "dst": "e", + "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": 1113, + "y": 1010 + }, + { + "x": 1574, + "y": 1010 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "id": "(a -> f)[0]", + "src": "a", + "srcArrow": "none", + "srcLabel": "", + "dst": "f", + "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": 267.5, + "y": 1140 + }, + { + "x": 2235.5, + "y": 1140 + } + ], + "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": 267.5, + "y": 360 + }, + { + "x": 267.5, + "y": 1270 + } + ], + "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": 690.5, + "y": 360 + }, + { + "x": 690.5, + "y": 1270 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 1 + }, + { + "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": 1113, + "y": 360 + }, + { + "x": 1113, + "y": 1270 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 1 + }, + { + "id": "(e -- )[0]", + "src": "e", + "srcArrow": "none", + "srcLabel": "", + "dst": "e-lifeline-end-2214352275", + "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": 1574, + "y": 360 + }, + { + "x": 1574, + "y": 1270 + } + ], + "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": 1823.5, + "y": 360 + }, + { + "x": 1823.5, + "y": 1270 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 1 + }, + { + "id": "(f -- )[0]", + "src": "f", + "srcArrow": "none", + "srcLabel": "", + "dst": "f-lifeline-end-865917984", + "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": 2235.5, + "y": 360 + }, + { + "x": 2235.5, + "y": 1270 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 1 + } + ] +} 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..0e9876acc --- /dev/null +++ b/e2etests/testdata/stable/sequence_diagram_actor_distance/dagre/sketch.exp.svg @@ -0,0 +1,42 @@ + +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 + + + + + + + \ 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..2341f4127 --- /dev/null +++ b/e2etests/testdata/stable/sequence_diagram_actor_distance/elk/board.exp.json @@ -0,0 +1,715 @@ +{ + "name": "", + "shapes": [ + { + "id": "a", + "type": "", + "pos": { + "x": 24, + "y": 234 + }, + "width": 487, + "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": "an actor with a really long label that will break everything", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 387, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "c", + "type": "", + "pos": { + "x": 602, + "y": 74 + }, + "width": 177, + "height": 286, + "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": "an\nactor\nwith\na\nreally\nlong\nlabel\nthat\nwill\nbreak\neverything", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 77, + "labelHeight": 186, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "d", + "type": "", + "pos": { + "x": 1038, + "y": 234 + }, + "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": "simple", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 50, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "e", + "type": "", + "pos": { + "x": 1484, + "y": 234 + }, + "width": 180, + "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 short one", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 80, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "b", + "type": "", + "pos": { + "x": 1742, + "y": 234 + }, + "width": 163, + "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": "far away", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 63, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "f", + "type": "", + "pos": { + "x": 1955, + "y": 234 + }, + "width": 561, + "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": "what if there were no labels between this actor and the previous one", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 461, + "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": 267.5, + "y": 490 + }, + { + "x": 1823.5, + "y": 490 + } + ], + "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": "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": 267.5, + "y": 620 + }, + { + "x": 1823.5, + "y": 620 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "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": 690.5, + "y": 750 + }, + { + "x": 1113, + "y": 750 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "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": 267.5, + "y": 880 + }, + { + "x": 1113, + "y": 880 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "id": "(d -> e)[0]", + "src": "d", + "srcArrow": "none", + "srcLabel": "", + "dst": "e", + "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": 1113, + "y": 1010 + }, + { + "x": 1574, + "y": 1010 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "id": "(a -> f)[0]", + "src": "a", + "srcArrow": "none", + "srcLabel": "", + "dst": "f", + "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": 267.5, + "y": 1140 + }, + { + "x": 2235.5, + "y": 1140 + } + ], + "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": 267.5, + "y": 360 + }, + { + "x": 267.5, + "y": 1270 + } + ], + "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": 690.5, + "y": 360 + }, + { + "x": 690.5, + "y": 1270 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 1 + }, + { + "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": 1113, + "y": 360 + }, + { + "x": 1113, + "y": 1270 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 1 + }, + { + "id": "(e -- )[0]", + "src": "e", + "srcArrow": "none", + "srcLabel": "", + "dst": "e-lifeline-end-2214352275", + "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": 1574, + "y": 360 + }, + { + "x": 1574, + "y": 1270 + } + ], + "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": 1823.5, + "y": 360 + }, + { + "x": 1823.5, + "y": 1270 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 1 + }, + { + "id": "(f -- )[0]", + "src": "f", + "srcArrow": "none", + "srcLabel": "", + "dst": "f-lifeline-end-865917984", + "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": 2235.5, + "y": 360 + }, + { + "x": 2235.5, + "y": 1270 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 1 + } + ] +} 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..0e9876acc --- /dev/null +++ b/e2etests/testdata/stable/sequence_diagram_actor_distance/elk/sketch.exp.svg @@ -0,0 +1,42 @@ + +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 + + + + + + + \ 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 56c919de8..9f037376a 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 @@ -5,8 +5,8 @@ "id": "a", "type": "callout", "pos": { - "x": 0, - "y": 108 + "x": 24, + "y": 132 }, "width": 150, "height": 126, @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -44,8 +45,8 @@ "id": "b", "type": "oval", "pos": { - "x": 220, - "y": 90 + "x": 281, + "y": 114 }, "width": 150, "height": 144, @@ -62,6 +63,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -83,8 +85,8 @@ "id": "c", "type": "class", "pos": { - "x": 440, - "y": 50 + "x": 486, + "y": 74 }, "width": 241, "height": 184, @@ -101,6 +103,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": [ { @@ -133,8 +136,8 @@ "id": "d", "type": "cloud", "pos": { - "x": 751, - "y": 108 + "x": 777, + "y": 132 }, "width": 174, "height": 126, @@ -151,6 +154,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -172,8 +176,8 @@ "id": "e", "type": "code", "pos": { - "x": 995, - "y": 164 + "x": 1016, + "y": 188 }, "width": 196, "height": 70, @@ -190,6 +194,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -211,8 +216,8 @@ "id": "f", "type": "cylinder", "pos": { - "x": 1261, - "y": 108 + "x": 1289, + "y": 132 }, "width": 150, "height": 126, @@ -229,6 +234,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -250,8 +256,8 @@ "id": "g", "type": "diamond", "pos": { - "x": 1481, - "y": 108 + "x": 1539, + "y": 132 }, "width": 150, "height": 126, @@ -268,6 +274,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -289,8 +296,8 @@ "id": "h", "type": "document", "pos": { - "x": 1701, - "y": 108 + "x": 1789, + "y": 132 }, "width": 150, "height": 126, @@ -307,6 +314,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -328,8 +336,8 @@ "id": "i", "type": "hexagon", "pos": { - "x": 1921, - "y": 108 + "x": 2025, + "y": 132 }, "width": 177, "height": 126, @@ -346,6 +354,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -367,8 +376,8 @@ "id": "j", "type": "image", "pos": { - "x": 2168, - "y": 85 + "x": 2289, + "y": 109 }, "width": 150, "height": 128, @@ -396,6 +405,7 @@ "RawFragment": "" }, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -417,8 +427,8 @@ "id": "k", "type": "oval", "pos": { - "x": 2388, - "y": 108 + "x": 2539, + "y": 132 }, "width": 150, "height": 126, @@ -435,6 +445,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -456,8 +467,8 @@ "id": "l", "type": "package", "pos": { - "x": 2608, - "y": 108 + "x": 2789, + "y": 132 }, "width": 150, "height": 126, @@ -474,6 +485,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -495,8 +507,8 @@ "id": "m", "type": "page", "pos": { - "x": 2828, - "y": 108 + "x": 3027, + "y": 132 }, "width": 173, "height": 126, @@ -513,6 +525,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -534,8 +547,8 @@ "id": "n", "type": "parallelogram", "pos": { - "x": 3071, - "y": 92 + "x": 3275, + "y": 116 }, "width": 177, "height": 142, @@ -552,6 +565,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -573,8 +587,8 @@ "id": "o", "type": "person", "pos": { - "x": 3318, - "y": 55 + "x": 3538, + "y": 79 }, "width": 151, "height": 142, @@ -591,6 +605,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -612,8 +627,8 @@ "id": "p", "type": "queue", "pos": { - "x": 3539, - "y": 108 + "x": 3784, + "y": 132 }, "width": 159, "height": 126, @@ -630,6 +645,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -651,8 +667,8 @@ "id": "q", "type": "rectangle", "pos": { - "x": 3768, - "y": 71 + "x": 4032, + "y": 95 }, "width": 163, "height": 163, @@ -669,6 +685,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -690,8 +707,8 @@ "id": "r", "type": "step", "pos": { - "x": 4001, - "y": 108 + "x": 4260, + "y": 132 }, "width": 207, "height": 126, @@ -708,6 +725,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -729,8 +747,8 @@ "id": "s", "type": "stored_data", "pos": { - "x": 4278, - "y": 108 + "x": 4539, + "y": 132 }, "width": 150, "height": 126, @@ -747,6 +765,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -768,8 +787,8 @@ "id": "t", "type": "sql_table", "pos": { - "x": 4498, - "y": 126 + "x": 4759, + "y": 150 }, "width": 210, "height": 108, @@ -786,6 +805,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": [ @@ -844,12 +864,12 @@ "labelPercentage": 0, "route": [ { - "x": 75, - "y": 364 + "x": 99, + "y": 388 }, { - "x": 295, - "y": 364 + "x": 356, + "y": 388 } ], "animated": false, @@ -883,12 +903,12 @@ "labelPercentage": 0, "route": [ { - "x": 295, - "y": 494 + "x": 356, + "y": 518 }, { - "x": 560.5, - "y": 494 + "x": 606.5, + "y": 518 } ], "animated": false, @@ -922,12 +942,12 @@ "labelPercentage": 0, "route": [ { - "x": 560.5, - "y": 624 + "x": 606.5, + "y": 648 }, { - "x": 838, - "y": 624 + "x": 864, + "y": 648 } ], "animated": false, @@ -961,12 +981,12 @@ "labelPercentage": 0, "route": [ { - "x": 838, - "y": 754 + "x": 864, + "y": 778 }, { - "x": 1093, - "y": 754 + "x": 1114, + "y": 778 } ], "animated": false, @@ -1000,12 +1020,12 @@ "labelPercentage": 0, "route": [ { - "x": 1093, - "y": 884 + "x": 1114, + "y": 908 }, { - "x": 1336, - "y": 884 + "x": 1364, + "y": 908 } ], "animated": false, @@ -1039,12 +1059,12 @@ "labelPercentage": 0, "route": [ { - "x": 1336, - "y": 1014 + "x": 1364, + "y": 1038 }, { - "x": 1556, - "y": 1014 + "x": 1614, + "y": 1038 } ], "animated": false, @@ -1078,12 +1098,12 @@ "labelPercentage": 0, "route": [ { - "x": 1556, - "y": 1144 + "x": 1614, + "y": 1168 }, { - "x": 1776, - "y": 1144 + "x": 1864, + "y": 1168 } ], "animated": false, @@ -1117,12 +1137,12 @@ "labelPercentage": 0, "route": [ { - "x": 1776, - "y": 1274 + "x": 1864, + "y": 1298 }, { - "x": 2009.5, - "y": 1274 + "x": 2113.5, + "y": 1298 } ], "animated": false, @@ -1156,12 +1176,12 @@ "labelPercentage": 0, "route": [ { - "x": 2009.5, - "y": 1404 + "x": 2113.5, + "y": 1428 }, { - "x": 2243, - "y": 1404 + "x": 2364, + "y": 1428 } ], "animated": false, @@ -1195,12 +1215,12 @@ "labelPercentage": 0, "route": [ { - "x": 2243, - "y": 1534 + "x": 2364, + "y": 1558 }, { - "x": 2463, - "y": 1534 + "x": 2614, + "y": 1558 } ], "animated": false, @@ -1234,12 +1254,12 @@ "labelPercentage": 0, "route": [ { - "x": 2463, - "y": 1664 + "x": 2614, + "y": 1688 }, { - "x": 2683, - "y": 1664 + "x": 2864, + "y": 1688 } ], "animated": false, @@ -1273,12 +1293,12 @@ "labelPercentage": 0, "route": [ { - "x": 2683, - "y": 1794 + "x": 2864, + "y": 1818 }, { - "x": 2914.5, - "y": 1794 + "x": 3113.5, + "y": 1818 } ], "animated": false, @@ -1312,12 +1332,12 @@ "labelPercentage": 0, "route": [ { - "x": 2914.5, - "y": 1924 + "x": 3113.5, + "y": 1948 }, { - "x": 3159.5, - "y": 1924 + "x": 3363.5, + "y": 1948 } ], "animated": false, @@ -1351,12 +1371,12 @@ "labelPercentage": 0, "route": [ { - "x": 3159.5, - "y": 2054 + "x": 3363.5, + "y": 2078 }, { - "x": 3393.5, - "y": 2054 + "x": 3613.5, + "y": 2078 } ], "animated": false, @@ -1390,12 +1410,12 @@ "labelPercentage": 0, "route": [ { - "x": 3393.5, - "y": 2184 + "x": 3613.5, + "y": 2208 }, { - "x": 3618.5, - "y": 2184 + "x": 3863.5, + "y": 2208 } ], "animated": false, @@ -1429,12 +1449,12 @@ "labelPercentage": 0, "route": [ { - "x": 3618.5, - "y": 2314 + "x": 3863.5, + "y": 2338 }, { - "x": 3849.5, - "y": 2314 + "x": 4113.5, + "y": 2338 } ], "animated": false, @@ -1468,12 +1488,12 @@ "labelPercentage": 0, "route": [ { - "x": 3849.5, - "y": 2444 + "x": 4113.5, + "y": 2468 }, { - "x": 4104.5, - "y": 2444 + "x": 4363.5, + "y": 2468 } ], "animated": false, @@ -1507,12 +1527,12 @@ "labelPercentage": 0, "route": [ { - "x": 4104.5, - "y": 2574 + "x": 4363.5, + "y": 2598 }, { - "x": 4353, - "y": 2574 + "x": 4614, + "y": 2598 } ], "animated": false, @@ -1546,12 +1566,12 @@ "labelPercentage": 0, "route": [ { - "x": 4353, - "y": 2704 + "x": 4614, + "y": 2728 }, { - "x": 4603, - "y": 2704 + "x": 4864, + "y": 2728 } ], "animated": false, @@ -1585,18 +1605,18 @@ "labelPercentage": 0, "route": [ { - "x": 75, - "y": 234 + "x": 99, + "y": 258 }, { - "x": 75, - "y": 2834 + "x": 99, + "y": 2858 } ], "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(b -- )[0]", @@ -1624,18 +1644,18 @@ "labelPercentage": 0, "route": [ { - "x": 295, - "y": 234 + "x": 356, + "y": 258 }, { - "x": 295, - "y": 2834 + "x": 356, + "y": 2858 } ], "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(c -- )[0]", @@ -1663,18 +1683,18 @@ "labelPercentage": 0, "route": [ { - "x": 560.5, - "y": 234 + "x": 606.5, + "y": 258 }, { - "x": 560.5, - "y": 2834 + "x": 606.5, + "y": 2858 } ], "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(d -- )[0]", @@ -1702,18 +1722,18 @@ "labelPercentage": 0, "route": [ { - "x": 838, - "y": 234 + "x": 864, + "y": 258 }, { - "x": 838, - "y": 2834 + "x": 864, + "y": 2858 } ], "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(e -- )[0]", @@ -1741,18 +1761,18 @@ "labelPercentage": 0, "route": [ { - "x": 1093, - "y": 234 + "x": 1114, + "y": 258 }, { - "x": 1093, - "y": 2834 + "x": 1114, + "y": 2858 } ], "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(f -- )[0]", @@ -1780,18 +1800,18 @@ "labelPercentage": 0, "route": [ { - "x": 1336, - "y": 234 + "x": 1364, + "y": 258 }, { - "x": 1336, - "y": 2834 + "x": 1364, + "y": 2858 } ], "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(g -- )[0]", @@ -1819,18 +1839,18 @@ "labelPercentage": 0, "route": [ { - "x": 1556, - "y": 234 + "x": 1614, + "y": 258 }, { - "x": 1556, - "y": 2834 + "x": 1614, + "y": 2858 } ], "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(h -- )[0]", @@ -1858,18 +1878,18 @@ "labelPercentage": 0, "route": [ { - "x": 1776, - "y": 234 + "x": 1864, + "y": 258 }, { - "x": 1776, - "y": 2834 + "x": 1864, + "y": 2858 } ], "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(i -- )[0]", @@ -1897,18 +1917,18 @@ "labelPercentage": 0, "route": [ { - "x": 2009.5, - "y": 234 + "x": 2113.5, + "y": 258 }, { - "x": 2009.5, - "y": 2834 + "x": 2113.5, + "y": 2858 } ], "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(j -- )[0]", @@ -1936,18 +1956,18 @@ "labelPercentage": 0, "route": [ { - "x": 2243, - "y": 239 + "x": 2364, + "y": 263 }, { - "x": 2243, - "y": 2834 + "x": 2364, + "y": 2858 } ], "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(k -- )[0]", @@ -1975,18 +1995,18 @@ "labelPercentage": 0, "route": [ { - "x": 2463, - "y": 234 + "x": 2614, + "y": 258 }, { - "x": 2463, - "y": 2834 + "x": 2614, + "y": 2858 } ], "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(l -- )[0]", @@ -2014,18 +2034,18 @@ "labelPercentage": 0, "route": [ { - "x": 2683, - "y": 234 + "x": 2864, + "y": 258 }, { - "x": 2683, - "y": 2834 + "x": 2864, + "y": 2858 } ], "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(m -- )[0]", @@ -2053,18 +2073,18 @@ "labelPercentage": 0, "route": [ { - "x": 2914.5, - "y": 234 + "x": 3113.5, + "y": 258 }, { - "x": 2914.5, - "y": 2834 + "x": 3113.5, + "y": 2858 } ], "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(n -- )[0]", @@ -2092,18 +2112,18 @@ "labelPercentage": 0, "route": [ { - "x": 3159.5, - "y": 234 + "x": 3363.5, + "y": 258 }, { - "x": 3159.5, - "y": 2834 + "x": 3363.5, + "y": 2858 } ], "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(o -- )[0]", @@ -2131,18 +2151,18 @@ "labelPercentage": 0, "route": [ { - "x": 3393.5, - "y": 239 + "x": 3613.5, + "y": 263 }, { - "x": 3393.5, - "y": 2834 + "x": 3613.5, + "y": 2858 } ], "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(p -- )[0]", @@ -2170,18 +2190,18 @@ "labelPercentage": 0, "route": [ { - "x": 3618.5, - "y": 234 + "x": 3863.5, + "y": 258 }, { - "x": 3618.5, - "y": 2834 + "x": 3863.5, + "y": 2858 } ], "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(q -- )[0]", @@ -2209,18 +2229,18 @@ "labelPercentage": 0, "route": [ { - "x": 3849.5, - "y": 234 + "x": 4113.5, + "y": 258 }, { - "x": 3849.5, - "y": 2834 + "x": 4113.5, + "y": 2858 } ], "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(r -- )[0]", @@ -2248,18 +2268,18 @@ "labelPercentage": 0, "route": [ { - "x": 4104.5, - "y": 234 + "x": 4363.5, + "y": 258 }, { - "x": 4104.5, - "y": 2834 + "x": 4363.5, + "y": 2858 } ], "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(s -- )[0]", @@ -2287,18 +2307,18 @@ "labelPercentage": 0, "route": [ { - "x": 4353, - "y": 234 + "x": 4614, + "y": 258 }, { - "x": 4353, - "y": 2834 + "x": 4614, + "y": 2858 } ], "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(t -- )[0]", @@ -2326,18 +2346,18 @@ "labelPercentage": 0, "route": [ { - "x": 4603, - "y": 234 + "x": 4864, + "y": 258 }, { - "x": 4603, - "y": 2834 + "x": 4864, + "y": 2858 } ], "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 f121fc2d2..41fb9bd6b 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 + + + + + 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..8890d73c9 --- /dev/null +++ b/e2etests/testdata/stable/sequence_diagram_long_note/elk/board.exp.json @@ -0,0 +1,284 @@ +{ + "name": "", + "shapes": [ + { + "id": "b", + "type": "", + "pos": { + "x": 24, + "y": 74 + }, + "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": "page", + "pos": { + "x": -163, + "y": 460 + }, + "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", + "type": "", + "pos": { + "x": 337, + "y": 74 + }, + "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.note", + "type": "page", + "pos": { + "x": 343, + "y": 716 + }, + "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 + } + ], + "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": 412, + "y": 330 + }, + { + "x": 99, + "y": 330 + } + ], + "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": 99, + "y": 200 + }, + { + "x": 99, + "y": 1036 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 1 + }, + { + "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": 412, + "y": 200 + }, + { + "x": 412, + "y": 1036 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 1 + } + ] +} 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..d6e2f3ea0 --- /dev/null +++ b/e2etests/testdata/stable/sequence_diagram_long_note/elk/sketch.exp.svg @@ -0,0 +1,28 @@ + +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_groups/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_nested_groups/dagre/board.exp.json new file mode 100644 index 000000000..d025d92a5 --- /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": -97, + "y": 290 + }, + "width": 655, + "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": -73, + "y": 420 + }, + "width": 607, + "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": -49, + "y": 550 + }, + "width": 559, + "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": -25, + "y": 680 + }, + "width": 511, + "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": 24, + "y": 74 + }, + "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": "page", + "pos": { + "x": 25, + "y": 720 + }, + "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": 49, + "y": 1066 + }, + "width": 413, + "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": 338, + "y": 1172 + }, + "width": 460, + "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": 362, + "y": 1196 + }, + "width": 412, + "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": 362, + "y": 1326 + }, + "width": 412, + "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": 362, + "y": 1456 + }, + "width": 412, + "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": 362, + "y": 1586 + }, + "width": 412, + "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": 337, + "y": 74 + }, + "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": "page", + "pos": { + "x": 149, + "y": 2076 + }, + "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": "page", + "pos": { + "x": 30, + "y": 1756 + }, + "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": 629, + "y": 74 + }, + "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": 99, + "y": 330 + }, + { + "x": 412, + "y": 330 + } + ], + "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": 99, + "y": 460 + }, + { + "x": 412, + "y": 460 + } + ], + "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": 99, + "y": 590 + }, + { + "x": 412, + "y": 590 + } + ], + "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": 99, + "y": 976 + }, + { + "x": 412, + "y": 976 + } + ], + "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": 99, + "y": 1106 + }, + { + "x": 412, + "y": 1106 + } + ], + "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": 412, + "y": 1236 + }, + { + "x": 724, + "y": 1236 + } + ], + "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": 412, + "y": 1366 + }, + { + "x": 724, + "y": 1366 + } + ], + "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": 412, + "y": 1496 + }, + { + "x": 724, + "y": 1496 + } + ], + "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": 412, + "y": 1626 + }, + { + "x": 724, + "y": 1626 + } + ], + "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": 99, + "y": 200 + }, + { + "x": 99, + "y": 2332 + } + ], + "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": 412, + "y": 200 + }, + { + "x": 412, + "y": 2332 + } + ], + "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": 724, + "y": 200 + }, + { + "x": 724, + "y": 2332 + } + ], + "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..c723094ed --- /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..d025d92a5 --- /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": -97, + "y": 290 + }, + "width": 655, + "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": -73, + "y": 420 + }, + "width": 607, + "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": -49, + "y": 550 + }, + "width": 559, + "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": -25, + "y": 680 + }, + "width": 511, + "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": 24, + "y": 74 + }, + "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": "page", + "pos": { + "x": 25, + "y": 720 + }, + "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": 49, + "y": 1066 + }, + "width": 413, + "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": 338, + "y": 1172 + }, + "width": 460, + "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": 362, + "y": 1196 + }, + "width": 412, + "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": 362, + "y": 1326 + }, + "width": 412, + "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": 362, + "y": 1456 + }, + "width": 412, + "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": 362, + "y": 1586 + }, + "width": 412, + "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": 337, + "y": 74 + }, + "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": "page", + "pos": { + "x": 149, + "y": 2076 + }, + "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": "page", + "pos": { + "x": 30, + "y": 1756 + }, + "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": 629, + "y": 74 + }, + "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": 99, + "y": 330 + }, + { + "x": 412, + "y": 330 + } + ], + "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": 99, + "y": 460 + }, + { + "x": 412, + "y": 460 + } + ], + "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": 99, + "y": 590 + }, + { + "x": 412, + "y": 590 + } + ], + "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": 99, + "y": 976 + }, + { + "x": 412, + "y": 976 + } + ], + "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": 99, + "y": 1106 + }, + { + "x": 412, + "y": 1106 + } + ], + "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": 412, + "y": 1236 + }, + { + "x": 724, + "y": 1236 + } + ], + "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": 412, + "y": 1366 + }, + { + "x": 724, + "y": 1366 + } + ], + "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": 412, + "y": 1496 + }, + { + "x": 724, + "y": 1496 + } + ], + "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": 412, + "y": 1626 + }, + { + "x": 724, + "y": 1626 + } + ], + "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": 99, + "y": 200 + }, + { + "x": 99, + "y": 2332 + } + ], + "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": 412, + "y": 200 + }, + { + "x": 412, + "y": 2332 + } + ], + "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": 724, + "y": 200 + }, + { + "x": 724, + "y": 2332 + } + ], + "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..c723094ed --- /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/board.exp.json b/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/board.exp.json index 5b1b197f4..f43c4be26 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 @@ -5,8 +5,8 @@ "id": "scorer", "type": "", "pos": { - "x": 0, - "y": 50 + "x": 24, + "y": 74 }, "width": 150, "height": 126, @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -44,8 +45,8 @@ "id": "scorer.abc", "type": "rectangle", "pos": { - "x": 69, - "y": 1070 + "x": 93, + "y": 1094 }, "width": 12, "height": 80, @@ -62,6 +63,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -75,15 +77,15 @@ "underline": false, "labelWidth": 29, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 2 }, { "id": "itemResponse", "type": "", "pos": { - "x": 220, - "y": 50 + "x": 249, + "y": 74 }, "width": 200, "height": 126, @@ -100,6 +102,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -121,8 +124,8 @@ "id": "itemResponse.a", "type": "rectangle", "pos": { - "x": 314, - "y": 290 + "x": 343, + "y": 314 }, "width": 12, "height": 162, @@ -130,7 +133,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#EDF0FD", + "fill": "#E3E9FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -139,6 +142,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -152,15 +156,15 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 2 }, { "id": "item", "type": "", "pos": { - "x": 490, - "y": 50 + "x": 524, + "y": 74 }, "width": 150, "height": 126, @@ -177,6 +181,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -198,8 +203,8 @@ "id": "item.a", "type": "rectangle", "pos": { - "x": 559, - "y": 404 + "x": 593, + "y": 428 }, "width": 12, "height": 698, @@ -207,7 +212,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#EDF0FD", + "fill": "#E3E9FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -216,6 +221,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -229,15 +235,15 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 2 }, { "id": "item.a.b", "type": "rectangle", "pos": { - "x": 555, - "y": 420 + "x": 589, + "y": 444 }, "width": 20, "height": 162, @@ -245,7 +251,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -254,6 +260,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -267,15 +274,15 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 3 }, { "id": "essayRubric", "type": "", "pos": { - "x": 710, - "y": 50 + "x": 756, + "y": 74 }, "width": 186, "height": 126, @@ -292,6 +299,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -313,8 +321,8 @@ "id": "essayRubric.a", "type": "rectangle", "pos": { - "x": 797, - "y": 518 + "x": 843, + "y": 542 }, "width": 12, "height": 340, @@ -322,6 +330,45 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, + "fill": "#E3E9FD", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 12, + "labelHeight": 26, + "zIndex": 2, + "level": 2 + }, + { + "id": "essayRubric.a.b", + "type": "rectangle", + "pos": { + "x": 839, + "y": 558 + }, + "width": 20, + "height": 308, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, @@ -331,44 +378,7 @@ "link": "", "icon": null, "iconPosition": "", - "fields": null, - "methods": null, - "columns": null, - "label": "", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "#0A0F25", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 12, - "labelHeight": 26, - "zIndex": 3, - "level": 2 - }, - { - "id": "essayRubric.a.b", - "type": "rectangle", - "pos": { - "x": 793, - "y": 534 - }, - "width": 20, - "height": 308, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "#F7F8FE", - "stroke": "#0D32B2", - "shadow": false, - "3d": false, - "multiple": false, - "tooltip": "", - "link": "", - "icon": null, - "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -382,15 +392,15 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 3 }, { "id": "essayRubric.a.b.c", "type": "rectangle", "pos": { - "x": 789, - "y": 550 + "x": 835, + "y": 574 }, "width": 28, "height": 162, @@ -398,7 +408,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#FFFFFF", + "fill": "#EEF1F8", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -407,6 +417,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -420,15 +431,15 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 4 }, { "id": "concept", "type": "", "pos": { - "x": 966, - "y": 50 + "x": 1019, + "y": 74 }, "width": 160, "height": 126, @@ -445,6 +456,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -466,8 +478,8 @@ "id": "concept.a", "type": "rectangle", "pos": { - "x": 1040, - "y": 632 + "x": 1093, + "y": 656 }, "width": 12, "height": 388, @@ -475,6 +487,45 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, + "fill": "#E3E9FD", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 12, + "labelHeight": 26, + "zIndex": 2, + "level": 2 + }, + { + "id": "concept.a.b", + "type": "rectangle", + "pos": { + "x": 1089, + "y": 672 + }, + "width": 20, + "height": 356, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, @@ -484,44 +535,7 @@ "link": "", "icon": null, "iconPosition": "", - "fields": null, - "methods": null, - "columns": null, - "label": "", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "#0A0F25", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 12, - "labelHeight": 26, - "zIndex": 3, - "level": 2 - }, - { - "id": "concept.a.b", - "type": "rectangle", - "pos": { - "x": 1036, - "y": 648 - }, - "width": 20, - "height": 356, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "#F7F8FE", - "stroke": "#0D32B2", - "shadow": false, - "3d": false, - "multiple": false, - "tooltip": "", - "link": "", - "icon": null, - "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -535,15 +549,15 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 3 }, { "id": "concept.a.b.c", "type": "rectangle", "pos": { - "x": 1032, - "y": 664 + "x": 1085, + "y": 688 }, "width": 28, "height": 324, @@ -551,7 +565,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#FFFFFF", + "fill": "#EEF1F8", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -560,6 +574,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -573,15 +588,15 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 4 }, { "id": "concept.a.b.c.d", "type": "rectangle", "pos": { - "x": 1028, - "y": 680 + "x": 1081, + "y": 704 }, "width": 36, "height": 292, @@ -598,6 +613,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -611,15 +627,15 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 5 }, { "id": "itemOutcome", "type": "", "pos": { - "x": 1196, - "y": 50 + "x": 1251, + "y": 74 }, "width": 197, "height": 126, @@ -636,6 +652,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -657,8 +674,8 @@ "id": "itemOutcome.a", "type": "rectangle", "pos": { - "x": 1288, - "y": 876 + "x": 1343, + "y": 900 }, "width": 12, "height": 420, @@ -666,6 +683,45 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, + "fill": "#E3E9FD", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 12, + "labelHeight": 26, + "zIndex": 2, + "level": 2 + }, + { + "id": "itemOutcome.a.b", + "type": "rectangle", + "pos": { + "x": 1339, + "y": 916 + }, + "width": 20, + "height": 388, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, @@ -675,44 +731,7 @@ "link": "", "icon": null, "iconPosition": "", - "fields": null, - "methods": null, - "columns": null, - "label": "", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "#0A0F25", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 12, - "labelHeight": 26, - "zIndex": 3, - "level": 2 - }, - { - "id": "itemOutcome.a.b", - "type": "rectangle", - "pos": { - "x": 1284, - "y": 892 - }, - "width": 20, - "height": 388, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "#F7F8FE", - "stroke": "#0D32B2", - "shadow": false, - "3d": false, - "multiple": false, - "tooltip": "", - "link": "", - "icon": null, - "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -726,15 +745,15 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 3 }, { "id": "itemOutcome.a.b.c", "type": "rectangle", "pos": { - "x": 1280, - "y": 908 + "x": 1335, + "y": 932 }, "width": 28, "height": 356, @@ -742,7 +761,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#FFFFFF", + "fill": "#EEF1F8", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -751,6 +770,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -764,15 +784,15 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 4 }, { "id": "itemOutcome.a.b.c.d", "type": "rectangle", "pos": { - "x": 1276, - "y": 924 + "x": 1331, + "y": 948 }, "width": 36, "height": 324, @@ -789,6 +809,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -802,15 +823,15 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 5 }, { "id": "itemOutcome.a.b.c.d.e", "type": "rectangle", "pos": { - "x": 1272, - "y": 940 + "x": 1327, + "y": 964 }, "width": 44, "height": 292, @@ -827,6 +848,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, @@ -840,15 +862,15 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 3, + "zIndex": 2, "level": 6 }, { "id": "itemResponse.c", "type": "rectangle", "pos": { - "x": 314, - "y": 1330 + "x": 343, + "y": 1354 }, "width": 12, "height": 80, @@ -856,7 +878,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#EDF0FD", + "fill": "#E3E9FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -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 } ], @@ -909,12 +932,12 @@ "labelPercentage": 0, "route": [ { - "x": 75, - "y": 306 + "x": 99, + "y": 330 }, { - "x": 314, - "y": 306 + "x": 343, + "y": 330 } ], "animated": false, @@ -948,12 +971,12 @@ "labelPercentage": 0, "route": [ { - "x": 326, - "y": 436 + "x": 355, + "y": 460 }, { - "x": 555, - "y": 436 + "x": 589, + "y": 460 } ], "animated": false, @@ -987,12 +1010,12 @@ "labelPercentage": 0, "route": [ { - "x": 575, - "y": 566 + "x": 609, + "y": 590 }, { - "x": 789, - "y": 566 + "x": 835, + "y": 590 } ], "animated": false, @@ -1026,12 +1049,12 @@ "labelPercentage": 0, "route": [ { - "x": 817, - "y": 696 + "x": 863, + "y": 720 }, { - "x": 1028, - "y": 696 + "x": 1081, + "y": 720 } ], "animated": false, @@ -1065,12 +1088,12 @@ "labelPercentage": 0, "route": [ { - "x": 571, - "y": 826 + "x": 605, + "y": 850 }, { - "x": 793, - "y": 826 + "x": 839, + "y": 850 } ], "animated": false, @@ -1104,12 +1127,12 @@ "labelPercentage": 0, "route": [ { - "x": 1064, - "y": 956 + "x": 1117, + "y": 980 }, { - "x": 1272.5, - "y": 956 + "x": 1327.5, + "y": 980 } ], "animated": false, @@ -1143,12 +1166,12 @@ "labelPercentage": 0, "route": [ { - "x": 81, - "y": 1086 + "x": 105, + "y": 1110 }, { - "x": 559, - "y": 1086 + "x": 593, + "y": 1110 } ], "animated": false, @@ -1182,12 +1205,12 @@ "labelPercentage": 0, "route": [ { - "x": 1272.5, - "y": 1216 + "x": 1327.5, + "y": 1240 }, { - "x": 75, - "y": 1216 + "x": 99, + "y": 1240 } ], "animated": false, @@ -1221,12 +1244,12 @@ "labelPercentage": 0, "route": [ { - "x": 75, - "y": 1346 + "x": 99, + "y": 1370 }, { - "x": 314, - "y": 1346 + "x": 343, + "y": 1370 } ], "animated": false, @@ -1260,18 +1283,18 @@ "labelPercentage": 0, "route": [ { - "x": 75, - "y": 176 + "x": 99, + "y": 200 }, { - "x": 75, - "y": 1476 + "x": 99, + "y": 1500 } ], "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(itemResponse -- )[0]", @@ -1299,18 +1322,18 @@ "labelPercentage": 0, "route": [ { - "x": 320, - "y": 176 + "x": 349, + "y": 200 }, { - "x": 320, - "y": 1476 + "x": 349, + "y": 1500 } ], "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(item -- )[0]", @@ -1338,18 +1361,18 @@ "labelPercentage": 0, "route": [ { - "x": 565, - "y": 176 + "x": 599, + "y": 200 }, { - "x": 565, - "y": 1476 + "x": 599, + "y": 1500 } ], "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(essayRubric -- )[0]", @@ -1377,18 +1400,18 @@ "labelPercentage": 0, "route": [ { - "x": 803, - "y": 176 + "x": 849, + "y": 200 }, { - "x": 803, - "y": 1476 + "x": 849, + "y": 1500 } ], "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(concept -- )[0]", @@ -1416,18 +1439,18 @@ "labelPercentage": 0, "route": [ { - "x": 1046, - "y": 176 + "x": 1099, + "y": 200 }, { - "x": 1046, - "y": 1476 + "x": 1099, + "y": 1500 } ], "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 1 }, { "id": "(itemOutcome -- )[0]", @@ -1455,18 +1478,18 @@ "labelPercentage": 0, "route": [ { - "x": 1294.5, - "y": 176 + "x": 1349.5, + "y": 200 }, { - "x": 1294.5, - "y": 1476 + "x": 1349.5, + "y": 1500 } ], "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..7d7f04df2 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) + + + + + + + + + + + + + + + + + + + + + + + + + usersid 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..f1ca8409b 100644 --- a/e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg @@ -12,6 +12,10 @@ width="1082" height="660" viewBox="-88 -88 1082 660">usersid 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..834d15ac7 100644 --- a/e2etests/testdata/stable/square_3d/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/square_3d/dagre/sketch.exp.svg @@ -12,6 +12,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..51c0cbe04 100644 --- a/e2etests/testdata/stable/square_3d/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/square_3d/elk/sketch.exp.svg @@ -12,6 +12,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..fea7e02e7 100644 --- a/e2etests/testdata/stable/straight_hierarchy_container/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/straight_hierarchy_container/dagre/sketch.exp.svg @@ -12,6 +12,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..1668e14fd 100644 --- a/e2etests/testdata/stable/stylish/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/stylish/elk/sketch.exp.svg @@ -12,6 +12,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..ab997d9a1 100644 --- a/e2etests/testdata/stable/transparent_3d/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/transparent_3d/dagre/sketch.exp.svg @@ -12,6 +12,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..a5dfd5e2a 100644 --- a/e2etests/testdata/stable/transparent_3d/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/transparent_3d/elk/sketch.exp.svg @@ -12,6 +12,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..539986eb2 100644 --- a/e2etests/testdata/stable/us_map/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/us_map/dagre/sketch.exp.svg @@ -12,6 +12,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..df3ac9c7a 100644 --- a/e2etests/testdata/todo/container_child_edge/elk/sketch.exp.svg +++ b/e2etests/testdata/todo/container_child_edge/elk/sketch.exp.svg @@ -12,6 +12,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..bf4b4f2b7 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 @@ -12,6 +12,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..c417a43f7 100644 --- a/e2etests/testdata/todo/font_sizes_large/elk/sketch.exp.svg +++ b/e2etests/testdata/todo/font_sizes_large/elk/sketch.exp.svg @@ -12,6 +12,10 @@ width="789" height="2014" viewBox="-39 -88 789 2014">eightsixteenthirty twosixty fourninety nine twelvetwenty fourforty eighteighty one diff --git a/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/dagre/board.exp.json b/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/dagre/board.exp.json new file mode 100644 index 000000000..bf9dc2e70 --- /dev/null +++ b/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/dagre/board.exp.json @@ -0,0 +1,673 @@ +{ + "name": "", + "shapes": [ + { + "id": "b", + "type": "", + "pos": { + "x": 24, + "y": 74 + }, + "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": "a", + "type": "", + "pos": { + "x": 274, + "y": 74 + }, + "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": "c", + "type": "", + "pos": { + "x": 524, + "y": 74 + }, + "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": "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": -47, + "y": 420 + }, + "width": 542, + "height": 696, + "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": -23, + "y": 550 + }, + "width": 494, + "height": 542, + "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": 1, + "y": 680 + }, + "width": 446, + "height": 388, + "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.yo", + "type": "", + "pos": { + "x": 25, + "y": 810 + }, + "width": 398, + "height": 234, + "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": "yo", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 21, + "labelHeight": 26, + "zIndex": 3, + "level": 4 + }, + { + "id": "this is a message group.and this is a nested message group.what about more nesting.yo.yo", + "type": "", + "pos": { + "x": 49, + "y": 940 + }, + "width": 350, + "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": "yo", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 21, + "labelHeight": 26, + "zIndex": 3, + "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": 99, + "y": 330 + }, + { + "x": 599, + "y": 330 + } + ], + "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": 349, + "y": 460 + }, + { + "x": 99, + "y": 460 + } + ], + "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": 349, + "y": 590 + }, + { + "x": 99, + "y": 590 + } + ], + "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": 349, + "y": 720 + }, + { + "x": 99, + "y": 720 + } + ], + "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": 349, + "y": 850 + }, + { + "x": 99, + "y": 850 + } + ], + "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": 349, + "y": 980 + }, + { + "x": 99, + "y": 980 + } + ], + "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": 99, + "y": 200 + }, + { + "x": 99, + "y": 1110 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 1 + }, + { + "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": 349, + "y": 200 + }, + { + "x": 349, + "y": 1110 + } + ], + "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": 599, + "y": 200 + }, + { + "x": 599, + "y": 1110 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 1 + } + ] +} diff --git a/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/dagre/sketch.exp.svg b/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/dagre/sketch.exp.svg new file mode 100644 index 000000000..45f3f9430 --- /dev/null +++ b/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/dagre/sketch.exp.svg @@ -0,0 +1,28 @@ + +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..bf9dc2e70 --- /dev/null +++ b/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/elk/board.exp.json @@ -0,0 +1,673 @@ +{ + "name": "", + "shapes": [ + { + "id": "b", + "type": "", + "pos": { + "x": 24, + "y": 74 + }, + "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": "a", + "type": "", + "pos": { + "x": 274, + "y": 74 + }, + "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": "c", + "type": "", + "pos": { + "x": 524, + "y": 74 + }, + "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": "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": -47, + "y": 420 + }, + "width": 542, + "height": 696, + "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": -23, + "y": 550 + }, + "width": 494, + "height": 542, + "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": 1, + "y": 680 + }, + "width": 446, + "height": 388, + "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.yo", + "type": "", + "pos": { + "x": 25, + "y": 810 + }, + "width": 398, + "height": 234, + "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": "yo", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 21, + "labelHeight": 26, + "zIndex": 3, + "level": 4 + }, + { + "id": "this is a message group.and this is a nested message group.what about more nesting.yo.yo", + "type": "", + "pos": { + "x": 49, + "y": 940 + }, + "width": 350, + "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": "yo", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 21, + "labelHeight": 26, + "zIndex": 3, + "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": 99, + "y": 330 + }, + { + "x": 599, + "y": 330 + } + ], + "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": 349, + "y": 460 + }, + { + "x": 99, + "y": 460 + } + ], + "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": 349, + "y": 590 + }, + { + "x": 99, + "y": 590 + } + ], + "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": 349, + "y": 720 + }, + { + "x": 99, + "y": 720 + } + ], + "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": 349, + "y": 850 + }, + { + "x": 99, + "y": 850 + } + ], + "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": 349, + "y": 980 + }, + { + "x": 99, + "y": 980 + } + ], + "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": 99, + "y": 200 + }, + { + "x": 99, + "y": 1110 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 1 + }, + { + "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": 349, + "y": 200 + }, + { + "x": 349, + "y": 1110 + } + ], + "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": 599, + "y": 200 + }, + { + "x": 599, + "y": 1110 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 1 + } + ] +} 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..45f3f9430 --- /dev/null +++ b/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/elk/sketch.exp.svg @@ -0,0 +1,28 @@ + +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/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..48d953e8d 100644 --- a/e2etests/testdata/todo/tall_edge_label/dagre/sketch.exp.svg +++ b/e2etests/testdata/todo/tall_edge_label/dagre/sketch.exp.svg @@ -12,6 +12,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..23e6ddfba 100644 --- a/e2etests/testdata/todo/tall_edge_label/elk/sketch.exp.svg +++ b/e2etests/testdata/todo/tall_edge_label/elk/sketch.exp.svg @@ -12,6 +12,10 @@ width="313" height="785" viewBox="-88 -88 313 785">ab Thereoncewasaverytalledgelabel 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 + } + } + } + } +}`, }, } diff --git a/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json b/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json new file mode 100644 index 000000000..f9ae8f701 --- /dev/null +++ b/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json @@ -0,0 +1,102 @@ +{ + "graph": { + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/unescaped_id_cr.d2,0:0:0-0:4:4", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/unescaped_id_cr.d2,0:0:0-0:4:4", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/unescaped_id_cr.d2,0:0:0-0:4:4", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/unescaped_id_cr.d2,0:0:0-0:4:4", + "value": [ + { + "string": "b\rb", + "raw_string": "b\\rb" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "attributes": { + "label": { + "value": "" + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + } + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "b\rb", + "id_val": "b\rb", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/unescaped_id_cr.d2,0:0:0-0:4:4", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/unescaped_id_cr.d2,0:0:0-0:4:4", + "value": [ + { + "string": "b\rb", + "raw_string": "b\\rb" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "b\rb" + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + } + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2exporter/TestExport/connection/arrowhead.exp.json b/testdata/d2exporter/TestExport/connection/arrowhead.exp.json index 60ac88668..09b26f2db 100644 --- a/testdata/d2exporter/TestExport/connection/arrowhead.exp.json +++ b/testdata/d2exporter/TestExport/connection/arrowhead.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, diff --git a/testdata/d2exporter/TestExport/connection/basic.exp.json b/testdata/d2exporter/TestExport/connection/basic.exp.json index 726218c9c..50d65855d 100644 --- a/testdata/d2exporter/TestExport/connection/basic.exp.json +++ b/testdata/d2exporter/TestExport/connection/basic.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, diff --git a/testdata/d2exporter/TestExport/connection/stroke-dash.exp.json b/testdata/d2exporter/TestExport/connection/stroke-dash.exp.json index 4d68e010d..aa483fe31 100644 --- a/testdata/d2exporter/TestExport/connection/stroke-dash.exp.json +++ b/testdata/d2exporter/TestExport/connection/stroke-dash.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, diff --git a/testdata/d2exporter/TestExport/connection/theme_stroke-dash.exp.json b/testdata/d2exporter/TestExport/connection/theme_stroke-dash.exp.json index e97b648ac..d1add431f 100644 --- a/testdata/d2exporter/TestExport/connection/theme_stroke-dash.exp.json +++ b/testdata/d2exporter/TestExport/connection/theme_stroke-dash.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, diff --git a/testdata/d2exporter/TestExport/label/basic_shape.exp.json b/testdata/d2exporter/TestExport/label/basic_shape.exp.json index 931fe4753..f017e35f5 100644 --- a/testdata/d2exporter/TestExport/label/basic_shape.exp.json +++ b/testdata/d2exporter/TestExport/label/basic_shape.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, diff --git a/testdata/d2exporter/TestExport/label/connection_font_color.exp.json b/testdata/d2exporter/TestExport/label/connection_font_color.exp.json index 748ca5390..62cf2719e 100644 --- a/testdata/d2exporter/TestExport/label/connection_font_color.exp.json +++ b/testdata/d2exporter/TestExport/label/connection_font_color.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, diff --git a/testdata/d2exporter/TestExport/label/shape_font_color.exp.json b/testdata/d2exporter/TestExport/label/shape_font_color.exp.json index e0985129a..00b3d298e 100644 --- a/testdata/d2exporter/TestExport/label/shape_font_color.exp.json +++ b/testdata/d2exporter/TestExport/label/shape_font_color.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, diff --git a/testdata/d2exporter/TestExport/shape/basic.exp.json b/testdata/d2exporter/TestExport/shape/basic.exp.json index ec233aa08..226cbb94e 100644 --- a/testdata/d2exporter/TestExport/shape/basic.exp.json +++ b/testdata/d2exporter/TestExport/shape/basic.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, diff --git a/testdata/d2exporter/TestExport/shape/border-radius.exp.json b/testdata/d2exporter/TestExport/shape/border-radius.exp.json index 6b9a69075..0a934ec54 100644 --- a/testdata/d2exporter/TestExport/shape/border-radius.exp.json +++ b/testdata/d2exporter/TestExport/shape/border-radius.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, diff --git a/testdata/d2exporter/TestExport/shape/image_dimensions.exp.json b/testdata/d2exporter/TestExport/shape/image_dimensions.exp.json index f33f6473d..637bd91e8 100644 --- a/testdata/d2exporter/TestExport/shape/image_dimensions.exp.json +++ b/testdata/d2exporter/TestExport/shape/image_dimensions.exp.json @@ -34,6 +34,7 @@ "RawFragment": "" }, "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, "fields": null, "methods": null, "columns": null, diff --git a/testdata/d2exporter/TestExport/shape/synonyms.exp.json b/testdata/d2exporter/TestExport/shape/synonyms.exp.json index b67ca940a..dc02f5a8f 100644 --- a/testdata/d2exporter/TestExport/shape/synonyms.exp.json +++ b/testdata/d2exporter/TestExport/shape/synonyms.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, diff --git a/testdata/d2exporter/TestExport/shape/text_color.exp.json b/testdata/d2exporter/TestExport/shape/text_color.exp.json index db7273d5a..dc35c0b97 100644 --- a/testdata/d2exporter/TestExport/shape/text_color.exp.json +++ b/testdata/d2exporter/TestExport/shape/text_color.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, diff --git a/testdata/d2exporter/TestExport/theme/connection_with_bold.exp.json b/testdata/d2exporter/TestExport/theme/connection_with_bold.exp.json index cf2e7cf34..c0f461b9a 100644 --- a/testdata/d2exporter/TestExport/theme/connection_with_bold.exp.json +++ b/testdata/d2exporter/TestExport/theme/connection_with_bold.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, diff --git a/testdata/d2exporter/TestExport/theme/connection_with_italic.exp.json b/testdata/d2exporter/TestExport/theme/connection_with_italic.exp.json index b3d780bb9..629847c8f 100644 --- a/testdata/d2exporter/TestExport/theme/connection_with_italic.exp.json +++ b/testdata/d2exporter/TestExport/theme/connection_with_italic.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, diff --git a/testdata/d2exporter/TestExport/theme/connection_without_italic.exp.json b/testdata/d2exporter/TestExport/theme/connection_without_italic.exp.json index b1d30b075..dd3636dc0 100644 --- a/testdata/d2exporter/TestExport/theme/connection_without_italic.exp.json +++ b/testdata/d2exporter/TestExport/theme/connection_without_italic.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, diff --git a/testdata/d2exporter/TestExport/theme/shape_with_italic.exp.json b/testdata/d2exporter/TestExport/theme/shape_with_italic.exp.json index 73a0eab3c..7672ab131 100644 --- a/testdata/d2exporter/TestExport/theme/shape_with_italic.exp.json +++ b/testdata/d2exporter/TestExport/theme/shape_with_italic.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null, diff --git a/testdata/d2exporter/TestExport/theme/shape_without_bold.exp.json b/testdata/d2exporter/TestExport/theme/shape_without_bold.exp.json index e136a4d38..c8b3c3d9f 100644 --- a/testdata/d2exporter/TestExport/theme/shape_without_bold.exp.json +++ b/testdata/d2exporter/TestExport/theme/shape_without_bold.exp.json @@ -23,6 +23,7 @@ "link": "", "icon": null, "iconPosition": "", + "blend": false, "fields": null, "methods": null, "columns": null,