From d90eb355d3432731a6b9822573400b04d084164f Mon Sep 17 00:00:00 2001
From: Alexander Wang <alex@terrastruct.com>
Date: Mon, 5 Dec 2022 14:30:40 -0800
Subject: [PATCH] prs

---
 d2exporter/export.go           | 3 +--
 d2graph/d2graph.go             | 6 +++---
 d2layouts/d2sequence/layout.go | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/d2exporter/export.go b/d2exporter/export.go
index d39831a2e..1f2a15b8d 100644
--- a/d2exporter/export.go
+++ b/d2exporter/export.go
@@ -3,7 +3,6 @@ package d2exporter
 import (
 	"context"
 	"strconv"
-	"strings"
 
 	"oss.terrastruct.com/d2/d2graph"
 	"oss.terrastruct.com/d2/d2target"
@@ -100,7 +99,7 @@ func toShape(obj *d2graph.Object, theme *d2themes.Theme) d2target.Shape {
 	shape.Italic = text.IsItalic
 	shape.FontSize = text.FontSize
 
-	if strings.EqualFold(obj.Attributes.Shape.Value, d2target.ShapeSequenceDiagram) {
+	if obj.IsSequenceDiagram() {
 		shape.StrokeWidth = 0
 	}
 
diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go
index 3766d6d92..b7af9f2a3 100644
--- a/d2graph/d2graph.go
+++ b/d2graph/d2graph.go
@@ -343,12 +343,12 @@ func (obj *Object) GetFill(theme *d2themes.Theme) string {
 		return theme.Colors.Neutrals.N7
 	}
 
-	shape := obj.Attributes.Shape.Value
-
-	if strings.EqualFold(shape, d2target.ShapeSequenceDiagram) {
+	if obj.IsSequenceDiagram() {
 		return theme.Colors.Neutrals.N7
 	}
 
+	shape := obj.Attributes.Shape.Value
+
 	if shape == "" || strings.EqualFold(shape, d2target.ShapeSquare) || strings.EqualFold(shape, d2target.ShapeCircle) || strings.EqualFold(shape, d2target.ShapeOval) || strings.EqualFold(shape, d2target.ShapeRectangle) {
 		if level == 1 {
 			if !obj.IsContainer() {
diff --git a/d2layouts/d2sequence/layout.go b/d2layouts/d2sequence/layout.go
index 77f3c6a7d..6a9498642 100644
--- a/d2layouts/d2sequence/layout.go
+++ b/d2layouts/d2sequence/layout.go
@@ -156,7 +156,7 @@ func cleanup(g *d2graph.Graph, sequenceDiagrams map[string]*sequenceDiagram, obj
 			obj.ChildrenArray = append(obj.ChildrenArray, child)
 		}
 		for _, child := range sd.groups {
-			if child.Parent == obj {
+			if child.Parent.AbsID() == obj.AbsID() {
 				obj.Children[child.ID] = child
 				obj.ChildrenArray = append(obj.ChildrenArray, child)
 			}