luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix containers in grid layout

Browse source
This commit is contained in:
Gavin Nishizawa 2023-09-21 14:16:07 -07:00
parent 2cb2b406e6
commit 4385e63edd
No known key found for this signature in database
GPG key ID: AE3B177777CE55CD
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
d2layouts/d2layouts.go
View file

@ -48,14 +48,18 @@ func LayoutNested(ctx context.Context, g *d2graph.Graph, graphInfo GraphInfo, co
queue = append(queue, g.Root.ChildrenArray...) queue = append(queue, g.Root.ChildrenArray...)
for _, child := range queue { for _, child := range queue {
if gi := NestedGraphInfo(child); !gi.isDefault() { isGridCellContainer := (graphInfo.DiagramType == GridDiagram && child.IsContainer())
gi := NestedGraphInfo(child)
// if we are in a grid diagram, and our children have descendants
// we need to run layout on them first, even if they are not special diagram types
if isGridCellContainer || !gi.isDefault() {
extractedInfo[child] = gi extractedInfo[child] = gi
// There is a nested diagram here, so extract its contents and process in the same way // There is a nested diagram here, so extract its contents and process in the same way
nestedGraph := ExtractDescendants(child) nestedGraph := ExtractDescendants(child)
// Layout of nestedGraph is completed // Layout of nestedGraph is completed
// log.Error(ctx, "recurse", slog.F("child", child.AbsID()), slog.F("level", child.Level())) log.Info(ctx, "layout nested", slog.F("level", child.Level()), slog.F("child", child.AbsID()))
spacing := LayoutNested(ctx, nestedGraph, gi, coreLayout) spacing := LayoutNested(ctx, nestedGraph, gi, coreLayout)
log.Warn(ctx, "fitting child", slog.F("child", child.AbsID())) log.Warn(ctx, "fitting child", slog.F("child", child.AbsID()))
// Fit child to size of nested layout // Fit child to size of nested layout
@ -65,9 +69,9 @@ func LayoutNested(ctx context.Context, g *d2graph.Graph, graphInfo GraphInfo, co
// main layout is run, then near positions child, then descendants are injected with all others // main layout is run, then near positions child, then descendants are injected with all others
if gi.IsConstantNear { if gi.IsConstantNear {
nearGraph := ExtractSelf(child) nearGraph := ExtractSelf(child)
child.TopLeft = geo.NewPoint(0, 0)
constantNears = append(constantNears, nearGraph) constantNears = append(constantNears, nearGraph)
} }
child.TopLeft = geo.NewPoint(0, 0)
// We will restore the contents after running layout with child as the placeholder // We will restore the contents after running layout with child as the placeholder
extracted[child] = nestedGraph extracted[child] = nestedGraph