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

fix queue

Browse source
This commit is contained in:
Gavin Nishizawa 2023-09-21 17:27:22 -07:00
parent 596cd5ed06
commit a5dec20dd4
No known key found for this signature in database
GPG key ID: AE3B177777CE55CD
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
d2layouts/d2layouts.go
View file

@ -7,6 +7,7 @@ import (
"strings" "strings"
"cdr.dev/slog" "cdr.dev/slog"
"oss.terrastruct.com/d2/d2graph" "oss.terrastruct.com/d2/d2graph"
"oss.terrastruct.com/d2/d2layouts/d2grid" "oss.terrastruct.com/d2/d2layouts/d2grid"
"oss.terrastruct.com/d2/d2layouts/d2near" "oss.terrastruct.com/d2/d2layouts/d2near"
@ -83,7 +84,10 @@ func LayoutNested(ctx context.Context, g *d2graph.Graph, graphInfo GraphInfo, co
queue := make([]*d2graph.Object, 0, len(g.Root.ChildrenArray)) queue := make([]*d2graph.Object, 0, len(g.Root.ChildrenArray))
queue = append(queue, g.Root.ChildrenArray...) queue = append(queue, g.Root.ChildrenArray...)
for _, curr := range queue { for len(queue) > 0 {
curr := queue[0]
queue = queue[1:]
isGridCellContainer := graphInfo.DiagramType == GridDiagram && isGridCellContainer := graphInfo.DiagramType == GridDiagram &&
curr.IsContainer() && curr.Parent == g.Root curr.IsContainer() && curr.Parent == g.Root
gi := NestedGraphInfo(curr) gi := NestedGraphInfo(curr)
@ -140,11 +144,10 @@ func LayoutNested(ctx context.Context, g *d2graph.Graph, graphInfo GraphInfo, co
// 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[curr] = nestedGraph extracted[curr] = nestedGraph
} }
} else if len(curr.Children) > 0 { } else if len(curr.ChildrenArray) > 0 {
queue = append(queue, curr.ChildrenArray...) queue = append(queue, curr.ChildrenArray...)
} }
} }
log.Warn(ctx, "finished descendants", slog.F("rootlevel", g.RootLevel), slog.F("shapes", g.PrintString()))
// We can now run layout with accurate sizes of nested layout containers // We can now run layout with accurate sizes of nested layout containers
// Layout according to the type of diagram // Layout according to the type of diagram