From b8f00f32f192a079107294b93a18166abf49328c Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Sun, 4 Dec 2022 22:41:24 -0800 Subject: [PATCH] fix groups in dagre --- d2layouts/d2sequence/layout.go | 4 ++++ .../stable/sequence_diagram_real/dagre/board.exp.json | 9 ++++----- .../stable/sequence_diagram_real/dagre/sketch.exp.svg | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/d2layouts/d2sequence/layout.go b/d2layouts/d2sequence/layout.go index 3f8650259..33e82a0a4 100644 --- a/d2layouts/d2sequence/layout.go +++ b/d2layouts/d2sequence/layout.go @@ -56,6 +56,9 @@ func Layout(ctx context.Context, g *d2graph.Graph, layout func(ctx context.Conte for _, obj := range sd.notes { objectsToRemove[obj] = struct{}{} } + for _, obj := range sd.groups { + objectsToRemove[obj] = struct{}{} + } for _, obj := range sd.spans { objectsToRemove[obj] = struct{}{} } @@ -151,6 +154,7 @@ func cleanup(g *d2graph.Graph, sequenceDiagrams map[string]*sequenceDiagram, obj g.Edges = append(g.Edges, sequenceDiagrams[obj.AbsID()].lifelines...) g.Objects = append(g.Objects, sequenceDiagrams[obj.AbsID()].actors...) g.Objects = append(g.Objects, sequenceDiagrams[obj.AbsID()].notes...) + g.Objects = append(g.Objects, sequenceDiagrams[obj.AbsID()].groups...) g.Objects = append(g.Objects, sequenceDiagrams[obj.AbsID()].spans...) } diff --git a/e2etests/testdata/stable/sequence_diagram_real/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_real/dagre/board.exp.json index af19de48e..f9a659e82 100644 --- a/e2etests/testdata/stable/sequence_diagram_real/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_real/dagre/board.exp.json @@ -8,8 +8,8 @@ "x": 0, "y": 0 }, - "width": 1508, - "height": 180, + "width": 2193, + "height": 2288, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -356,8 +356,8 @@ "id": "How this is rendered.only if root is not sequence", "type": "", "pos": { - "x": 50, - "y": 50 + "x": 730, + "y": 1338 }, "width": 1408, "height": 80, @@ -387,7 +387,6 @@ "underline": false, "labelWidth": 195, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER", "zIndex": 1, "level": 2 }, diff --git a/e2etests/testdata/stable/sequence_diagram_real/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_real/dagre/sketch.exp.svg index f6eb86ef6..91e76ec0b 100644 --- a/e2etests/testdata/stable/sequence_diagram_real/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_real/dagre/sketch.exp.svg @@ -14,7 +14,7 @@ width="2393" height="2488" viewBox="-100 -100 2393 2488">How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutonly if root is not sequence 'How this is rendered: {...}'tokenized ASTcompile ASTobjects and edgesrun layout enginesrun engine on shape: sequence_diagram, temporarily removerun core engine on rest add back in sequence diagramsdiagram with correct positions and dimensionsexport diagram with chosen theme and rendererget theme stylesrender to SVGresulting SVGmeasurements also take place +How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutonly if root is not sequence 'How this is rendered: {...}'tokenized ASTcompile ASTobjects and edgesrun layout enginesrun engine on shape: sequence_diagram, temporarily removerun core engine on rest add back in sequence diagramsdiagram with correct positions and dimensionsexport diagram with chosen theme and rendererget theme stylesrender to SVGresulting SVGmeasurements also take place