Skip to content

Commit 189e5a0

Browse files
authored
Merge pull request terrastruct#1140 from alexstoick/feat/lifeline-inherit-actor-style
Lifeline should inherit the stroke style from the actor
2 parents 2e9c054 + 2a93d21 commit 189e5a0

File tree

15 files changed

+510
-498
lines changed

15 files changed

+510
-498
lines changed

ci/release/changelogs/next.md

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#### Improvements 🧹
99

1010
- Labels on parallel `dagre` connections include a gap between them [#1134](https://github.com/terrastruct/d2/pull/1134)
11+
- Sequence Diagram `Lifelines` now inherit the Actor `stroke` and `stroke-dash` [#1140](https://github.com/terrastruct/d2/pull/1140)
1112

1213
#### Bugfixes ⛑️
1314

d2layouts/d2sequence/sequence_diagram.go

+14-8
Original file line numberDiff line numberDiff line change
@@ -386,15 +386,21 @@ func (sd *sequenceDiagram) addLifelineEdges() {
386386
}
387387
actorLifelineEnd := actor.Center()
388388
actorLifelineEnd.Y = endY
389+
style := d2graph.Style{
390+
StrokeDash: &d2graph.Scalar{Value: fmt.Sprintf("%d", LIFELINE_STROKE_DASH)},
391+
StrokeWidth: &d2graph.Scalar{Value: fmt.Sprintf("%d", LIFELINE_STROKE_WIDTH)},
392+
}
393+
if actor.Attributes.Style.StrokeDash != nil {
394+
style.StrokeDash = &d2graph.Scalar{Value: actor.Attributes.Style.StrokeDash.Value}
395+
}
396+
if actor.Attributes.Style.Stroke != nil {
397+
style.Stroke = &d2graph.Scalar{Value: actor.Attributes.Style.Stroke.Value}
398+
}
399+
389400
sd.lifelines = append(sd.lifelines, &d2graph.Edge{
390-
Attributes: &d2graph.Attributes{
391-
Style: d2graph.Style{
392-
StrokeDash: &d2graph.Scalar{Value: fmt.Sprintf("%d", LIFELINE_STROKE_DASH)},
393-
StrokeWidth: &d2graph.Scalar{Value: fmt.Sprintf("%d", LIFELINE_STROKE_WIDTH)},
394-
},
395-
},
396-
Src: actor,
397-
SrcArrow: false,
401+
Attributes: &d2graph.Attributes{Style: style},
402+
Src: actor,
403+
SrcArrow: false,
398404
Dst: &d2graph.Object{
399405
ID: actor.ID + fmt.Sprintf("-lifeline-end-%d", go2.StringToIntHash(actor.ID+"-lifeline-end")),
400406
},

e2etests/stable_test.go

+7-2
Original file line numberDiff line numberDiff line change
@@ -1549,8 +1549,13 @@ finally: {
15491549
sequence: {
15501550
shape: sequence_diagram
15511551
# items appear in this order
1552-
scorer
1553-
concept
1552+
scorer {
1553+
style.stroke: red
1554+
style.stroke-dash: 2
1555+
}
1556+
concept {
1557+
style.stroke-width: 6
1558+
}
15541559
essayRubric
15551560
item
15561561
itemOutcome

e2etests/testdata/stable/sequence_diagram_nested_span/dagre/board.exp.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2etests/testdata/stable/sequence_diagram_nested_span/dagre/sketch.exp.svg

+76-76
Loading

e2etests/testdata/stable/sequence_diagram_nested_span/elk/board.exp.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2etests/testdata/stable/sequence_diagram_nested_span/elk/sketch.exp.svg

+76-76
Loading

e2etests/testdata/stable/sequence_diagram_simple/dagre/board.exp.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2etests/testdata/stable/sequence_diagram_simple/dagre/sketch.exp.svg

+79-79
Loading

e2etests/testdata/stable/sequence_diagram_simple/elk/board.exp.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2etests/testdata/stable/sequence_diagram_simple/elk/sketch.exp.svg

+79-79
Loading

e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg

+82-82
Loading

e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg

+82-82
Loading

0 commit comments

Comments
 (0)